fix：好办权限操作日志

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java

@@ -63,15 +63,14 @@ public interface HaobanRoleApiService {
 
 
     /**
-     * 查询新增的菜单
+     * 查询菜单权限
      *
      * @param wxEnterpriseId
      * @param clerkType
      * @param systemFlag
-     * @param menuCodes
      * @return {@link ServiceResponse }<{@link List }<{@link String }>>
      * @author mozhu
      * @date 2022-10-09 14:16:12
      */
-    ServiceResponse<List<String>> getMenuNotInMenuCodes(String wxEnterpriseId,Integer clerkType,Integer systemFlag,List<String> menuCodes);
+    ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId,Integer clerkType,Integer systemFlag);
 }

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

@@ -248,13 +248,13 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
     }
 
     @Override
-    public ServiceResponse<List<String>> getMenuNotInMenuCodes(String wxEnterpriseId, Integer clerkType, Integer systemFlag, List<String> menuCodes) {
+    public ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId, Integer clerkType, Integer systemFlag) {
         HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, systemFlag);
         if (haobanRoleBO == null) {
             return ServiceResponse.success();
         }
-        List<String> menuNotInMenuCodes = haobanRoleMenuService.getMenuNotInMenuCodes(wxEnterpriseId, haobanRoleBO.getRoleId(), menuCodes);
-        return ServiceResponse.success(menuNotInMenuCodes);
+        List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, haobanRoleBO.getRoleId());
+        return ServiceResponse.success(menuCodes);
     }
 
     @Override

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

 package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.core.convert.Convert;
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.common.utils.RolesListUtils;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanMenuQDTO;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO;
 import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
@@ -101,10 +103,13 @@ public class HaobanRoleController extends WebBaseController {
     }
 
     private void setEditLogByType(String wxEnterpriseId, StringBuffer stringBuffer, Integer clerkType, List<String> menuCodes, List<String> delMenuCodes) {
-        ServiceResponse<List<String>> menuNotInMenuCodes = haobanRoleApiService.getMenuNotInMenuCodes(wxEnterpriseId, clerkType, 1, menuCodes);
+        ServiceResponse<List<String>> listServiceResponse = haobanRoleApiService.getMenuCodesByClerkType(wxEnterpriseId, clerkType, 1);
         //新勾选的
-        List<String> newMenuCodes = menuNotInMenuCodes.getResult();
+        List<String> roleMenuCodes = listServiceResponse.getResult();
+        if (CollectionUtils.isNotEmpty(roleMenuCodes)) {
+            List<String> newMenuCodes = RolesListUtils.differenceList(roleMenuCodes, menuCodes);
             if (CollectionUtils.isNotEmpty(newMenuCodes)) {
+                logger.info("新增菜单code：{}", JSON.toJSONString(newMenuCodes));
                 for (String menuCode : newMenuCodes) {
                     ServiceResponse<String> serviceMenuNameByCode = haobanMenuApiService.getMenuNameByCode(menuCode);
                     String menuName = serviceMenuNameByCode.getResult();
@@ -112,8 +117,10 @@ public class HaobanRoleController extends WebBaseController {
                     stringBuffer.append(log);
                 }
             }
+        }
 
         if (CollectionUtils.isNotEmpty(delMenuCodes)) {
+            logger.info("删除菜单code:{}",JSON.toJSONString(delMenuCodes));
             //删除勾选的
             for (String menuCode : delMenuCodes) {
                 ServiceResponse<String> serviceMenuNameByCode = haobanMenuApiService.getMenuNameByCode(menuCode);