FengChaoYu преди 20 часа
родител
ревизия
513e15c6d6
променени са 1 файла, в които са добавени 4 реда и са изтрити 1 реда
  1. 4 1
      mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

+ 4 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -103,7 +103,10 @@ public class UserLogic {
 //        }
 
         userZfireParamBean.setCompanyWechatId("");
-        adminUser.getAdminCompanyWechat().setCompanyWechatId(null);
+        // 商户要使用查所有师傅
+        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
+            adminUser.getAdminCompanyWechat().setCompanyWechatId(null);
+        }
         FieldUtils.supplyParam(userZfireParamBean, UserVO.class, adminUser);
 
         IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null, isOK);