fix：好办权限操作日志

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

@@ -21,8 +21,14 @@ public class HaobanRoleMenuQDTO implements Serializable {
      * 权限id
      */
     private List<String> menuCodes;
-
+    /**
+     * 删除权限id
+     */
     private List<String> delMenuCodes;
+    /**
+     * 新增权限id
+     */
+    private List<String> addMenuCodes;
 
     public Long getRoleId() {
         return roleId;
@@ -55,5 +61,13 @@ public class HaobanRoleMenuQDTO implements Serializable {
     public void setDelMenuCodes(List<String> delMenuCodes) {
         this.delMenuCodes = delMenuCodes;
     }
+
+    public List<String> getAddMenuCodes() {
+        return addMenuCodes;
+    }
+
+    public void setAddMenuCodes(List<String> addMenuCodes) {
+        this.addMenuCodes = addMenuCodes;
+    }
 }
 

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

@@ -7,7 +7,6 @@ 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;
@@ -62,15 +61,16 @@ public class HaobanRoleController extends WebBaseController {
             optPage = "好办小程序权限-编辑")
     public RestResponse edit(@RequestBody HaobanRoleQDTO haobanRoleQDTO) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        StringBuffer stringBuffer = getEditLog(haobanRoleQDTO, login);
+        StringBuffer logContent = getEditLog(haobanRoleQDTO, login);
 
         ServiceResponse serviceResponse = haobanRoleApiService.edit(haobanRoleQDTO, login);
         if (!serviceResponse.isSuccess()) {
             GicLogRecordEvaluationContext.noWriteLog();
         }
-        GicLogRecordEvaluationContext.putAttribute("logContent", stringBuffer.toString());
+        if (logContent != null) {
+            GicLogRecordEvaluationContext.putAttribute("logContent", logContent.toString());
             GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
-
+        }
         return RestResponse.successResult();
     }
 
@@ -78,46 +78,39 @@ public class HaobanRoleController extends WebBaseController {
         HaobanRoleMenuQDTO clerkMenus = haobanRoleQDTO.getClerkMenus();
         HaobanRoleMenuQDTO manegeClerkMenus = haobanRoleQDTO.getManegeClerkMenus();
         HaobanRoleMenuQDTO managerMenus = haobanRoleQDTO.getManagerMenus();
-        String wxEnterpriseId = login.getWxEnterpriseId();
         StringBuffer stringBuffer = new StringBuffer();
         if (clerkMenus != null) {
             Integer clerkType = clerkMenus.getClerkType();
-            List<String> menuCodes = clerkMenus.getMenuCodes();
+            List<String> addMenuCodes = clerkMenus.getAddMenuCodes();
             List<String> delMenuCodes = clerkMenus.getDelMenuCodes();
-            setEditLogByType(wxEnterpriseId, stringBuffer, clerkType, menuCodes, delMenuCodes);
+            setEditLogByType(stringBuffer, clerkType, addMenuCodes, delMenuCodes);
         }
 
         if (manegeClerkMenus != null) {
             Integer clerkType = manegeClerkMenus.getClerkType();
-            List<String> menuCodes = manegeClerkMenus.getMenuCodes();
+            List<String> addMenuCodes = manegeClerkMenus.getAddMenuCodes();
             List<String> delMenuCodes = manegeClerkMenus.getDelMenuCodes();
-            setEditLogByType(wxEnterpriseId, stringBuffer, clerkType, menuCodes, delMenuCodes);
+            setEditLogByType(stringBuffer, clerkType, addMenuCodes, delMenuCodes);
         }
         if (managerMenus != null) {
             Integer clerkType = managerMenus.getClerkType();
-            List<String> menuCodes = managerMenus.getMenuCodes();
+            List<String> addMenuCodes = managerMenus.getAddMenuCodes();
             List<String> delMenuCodes = managerMenus.getDelMenuCodes();
-            setEditLogByType(wxEnterpriseId, stringBuffer, clerkType, menuCodes, delMenuCodes);
+            setEditLogByType(stringBuffer, clerkType, addMenuCodes, delMenuCodes);
         }
         return stringBuffer;
     }
 
-    private void setEditLogByType(String wxEnterpriseId, StringBuffer stringBuffer, Integer clerkType, List<String> menuCodes, List<String> delMenuCodes) {
-        ServiceResponse<List<String>> listServiceResponse = haobanRoleApiService.getMenuCodesByClerkType(wxEnterpriseId, clerkType, 1);
-        //新勾选的
-        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) {
+    private void setEditLogByType(StringBuffer stringBuffer, Integer clerkType, List<String> addMenuCodes, List<String> delMenuCodes) {
+        if (CollectionUtils.isNotEmpty(addMenuCodes)) {
+            logger.info("新增菜单code：{}", JSON.toJSONString(addMenuCodes));
+            for (String menuCode : addMenuCodes) {
                 ServiceResponse<String> serviceMenuNameByCode = haobanMenuApiService.getMenuNameByCode(menuCode);
                 String menuName = serviceMenuNameByCode.getResult();
                 String log = RoleClerkTypeEnum.getNameByCode(clerkType) + "/" + menuName + "/" + "勾选" + "\r\n";
                 stringBuffer.append(log);
             }
         }
-        }
 
         if (CollectionUtils.isNotEmpty(delMenuCodes)) {
             logger.info("删除菜单code:{}",JSON.toJSONString(delMenuCodes));