fix:报错

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanRoleQDTO.java

@@ -32,6 +32,8 @@ public class HaobanRoleQDTO implements Serializable {
 
     private String wxEnterpriseId;
 
+    private Integer systemFlag;
+
     public String getRoleName() {
         return roleName;
     }
@@ -71,5 +73,13 @@ public class HaobanRoleQDTO implements Serializable {
     public void setWxEnterpriseId(String wxEnterpriseId) {
         this.wxEnterpriseId = wxEnterpriseId;
     }
+
+    public Integer getSystemFlag() {
+        return systemFlag;
+    }
+
+    public void setSystemFlag(Integer systemFlag) {
+        this.systemFlag = systemFlag;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -109,6 +109,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         tabHaobanRole.setClerkType(clerkType);
         tabHaobanRole.setWxEnterpriseId(wxEnterpriseId);
         tabHaobanRole.setStatusFlag(1);
+        tabHaobanRole.setSystemFlag(haobanRoleQDTO.getSystemFlag());
         tabHaobanRole.setCreatorId(clerkId);
         tabHaobanRole.setCreatorName(clerkName);
         haobanRoles.add(tabHaobanRole);
@@ -207,7 +208,8 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             }
             haobanRoleQDTO.setRoleName(roleName);
             haobanRoleSystemQDTO.setRoleName(roleName);
-
+            haobanRoleQDTO.setSystemFlag(1);
+            haobanRoleSystemQDTO.setSystemFlag(0);
             List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
 
             if (RoleClerkTypeEnum.CLERK.getCode().equals(clerkType)) {
@@ -294,6 +296,8 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             }
             haobanRoleQDTO.setRoleName(roleName);
             haobanRoleSystemQDTO.setRoleName(roleName);
+            haobanRoleQDTO.setSystemFlag(1);
+            haobanRoleSystemQDTO.setSystemFlag(0);
 
             if (RoleClerkTypeEnum.CLERK.getCode().equals(clerkType)) {
                 HaobanRoleMenuQDTO clerkMenus = new HaobanRoleMenuQDTO();

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -22,10 +22,8 @@ import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult2;
-import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.anno.HttpLimit;
 import com.gic.haoban.common.anno.IgnoreLogin;
-import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
@@ -1259,8 +1257,10 @@ public class ClerkController extends WebBaseController {
      */
     @RequestMapping(value = "/queryMenuCodesByClerkType",method = RequestMethod.GET)
     private RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType) {
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(login.getWxEnterpriseId(), clerkType,1);
+        if (clerkType == null) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()),HaoBanErrCode.ERR_2.getMsg());
+        }
+        ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(this.getLoginUser().getWxEnterpriseId(), clerkType,1);
         return RestResponse.successResult(serviceResponse.getResult());
     }
 }