小程序管理后台权限修改

kmall-admin/src/main/java/com/kmall/admin/controller/CommentController.java

@@ -2,6 +2,7 @@ package com.kmall.admin.controller;
 
 import com.kmall.admin.entity.CommentEntity;
 import com.kmall.admin.service.CommentService;
+import com.kmall.admin.utils.ParamUtils;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
@@ -31,6 +32,7 @@ public class CommentController {
     @RequestMapping("/list")
     @RequiresPermissions("comment:list")
     public R list(@RequestParam Map<String, Object> params) {
+        ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", true);
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsController.java

@@ -49,7 +49,6 @@ public class GoodsController {
     @RequestMapping("/list")
     @RequiresPermissions("goods:list")
     public R list(@RequestParam Map<String, Object> params) {
-
         ParamUtils.setQueryPowerByRoleType(params, null, "merchSn", true);
         if (Dict.roleType.item_2.getItem().equals(ShiroUtils.getUserEntity().getRoleType())) {
             StoreEntity storeEntity = storeService.queryObject(ShiroUtils.getUserEntity().getStoreId());

kmall-admin/src/main/java/com/kmall/admin/controller/ThirdMerchantBizController.java

@@ -39,6 +39,15 @@ public class ThirdMerchantBizController {
     @RequiresPermissions("thirdmerchantbiz:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
+        ParamUtils.setQueryPowerByRoleType(params, null, "merchSn", true);
+        if (Dict.roleType.item_2.getItem().equals(ShiroUtils.getUserEntity().getRoleType())) {
+            StoreEntity storeEntity = storeService.queryObject(ShiroUtils.getUserEntity().getStoreId());
+            if(StringUtils.isNotEmpty(storeEntity.getThirdPartyMerchCode())) {
+                params.put("thirdPartyMerchCode", storeEntity.getThirdPartyMerchCode());
+            }else{
+                throw new RRException("请维护门店信息中的第三方商户编号信息！再进行商品查看");
+            }
+        }
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/resources/mybatis/mapper/CommentDao.xml

@@ -57,6 +57,7 @@
         mall_goods.name value_name
         from mall_comment LEFT JOIN mall_user ON mall_comment.user_id = mall_user.id
         LEFT JOIN mall_goods ON mall_comment.value_id = mall_goods.id
+        left join mall_order o on mall_comment.order_id = o.id
         WHERE 1=1
         <if test="userName != null and userName.trim() != ''">
             AND mall_user.username LIKE concat('%',#{userName},'%')
@@ -64,6 +65,9 @@
         <if test="valueName != null and valueName.trim() != ''">
             AND mall_goods.name LIKE concat('%',#{valueName},'%')
         </if>
+        <if test="storeId != null and storeId != ''">
+            AND o.store_id = #{storeId}
+        </if>
         <if test="status != null">
             AND mall_comment.status = #{status}
         </if>

kmall-admin/src/main/webapp/index.html

@@ -299,8 +299,6 @@
             getUser: function () {
                 $.getJSON("sys/user/info?_" + $.now(), function (r) {
                     vm.user = r.user;
-                    console.log(r.user.merchSn);
-                    console.log(r.user.merchName);
                     if(r.user.storeId){
                         vm.getStore(r.user.storeId);
                     }