fix：菜单编辑修改

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

@@ -34,15 +34,6 @@ public interface HaobanRoleApiService {
      */
     ServiceResponse edit(HaobanRoleQDTO haobanRoleQDTO,WebLoginDTO login);
 
-
-    /**
-     * 运维编辑
-     * @param haobanRoleQDTO
-     * @param login
-     * @return
-     */
-    ServiceResponse editOperation(HaobanRoleQDTO haobanRoleQDTO,WebLoginDTO login);
-
     /**
      * 获取类型菜单
      *

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

@@ -55,7 +55,8 @@ public class HaobanRoleOperationController {
         login.setWxEnterpriseId(haobanRoleQDTO.getWxEnterpriseId());
         login.setClerkId(operationUserId);
         login.setClerkName(loginUser.getLoginName());
-        return RestResponse.successResult(haobanRoleApiService.editOperation(haobanRoleQDTO,login));
+        haobanRoleQDTO.setSystemFlag(0);
+        return RestResponse.successResult(haobanRoleApiService.edit(haobanRoleQDTO,login));
     }
 
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanRoleMenuMapper.java

@@ -88,5 +88,7 @@ public interface TabHaobanRoleMenuMapper {
     List<String> getMenuNotInMenuCodes(@Param("wxEnterpriseId") String wxEnterpriseId,
                                        @Param("roleId") Long roleId,
                                        @Param("menuCodes")  List<String> menuCodes);
+
+    int deleteByMenuCode(@Param("menuCode") String menuCode, @Param("wxEnterpriseId") String wxEnterpriseId);
 }
 

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

@@ -126,6 +126,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         HaobanRoleMenuQDTO clerkMenus = haobanRoleQDTO.getClerkMenus();
         HaobanRoleMenuQDTO manegeClerkMenus = haobanRoleQDTO.getManegeClerkMenus();
         HaobanRoleMenuQDTO managerMenus = haobanRoleQDTO.getManagerMenus();
+        Integer systemFlag = haobanRoleQDTO.getSystemFlag();
         String wxEnterpriseId = login.getWxEnterpriseId();
         String clerkId = login.getClerkId();
         String clerkName = login.getClerkName();
@@ -138,45 +139,11 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             for (String menuCode : menuCodes) {
                 getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
             }
+            if (systemFlag == 0) {
+                List<String> delMenuCodes = clerkMenus.getDelMenuCodes();
+                for (String delMenuCode : delMenuCodes) {
+                    haobanRoleMenuService.deleteByMenuCode(delMenuCode,wxEnterpriseId);
                 }
-
-        //店长
-        if (manegeClerkMenus != null) {
-            TabHaobanRole tabHaobanRole = updateTabHaobanRole(haobanRoleQDTO, manegeClerkMenus, wxEnterpriseId, clerkId, clerkName, now);
-            List<String> menuCodes = manegeClerkMenus.getMenuCodes();
-            for (String menuCode : menuCodes) {
-                getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
-            }
-        }
-
-        //导购
-        if (managerMenus != null) {
-            TabHaobanRole tabHaobanRole = updateTabHaobanRole(haobanRoleQDTO, managerMenus, wxEnterpriseId, clerkId, clerkName, now);
-            List<String> menuCodes = managerMenus.getMenuCodes();
-            for (String menuCode : menuCodes) {
-                getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
-            }
-        }
-        haobanRoleMenuService.insertBatch(tabHaobanRoleMenus);
-        return ServiceResponse.success();
-    }
-
-    @Override
-    public ServiceResponse editOperation(HaobanRoleQDTO haobanRoleQDTO, WebLoginDTO login) {
-        HaobanRoleMenuQDTO clerkMenus = haobanRoleQDTO.getClerkMenus();
-        HaobanRoleMenuQDTO manegeClerkMenus = haobanRoleQDTO.getManegeClerkMenus();
-        HaobanRoleMenuQDTO managerMenus = haobanRoleQDTO.getManagerMenus();
-        String wxEnterpriseId = login.getWxEnterpriseId();
-        String clerkId = login.getClerkId();
-        String clerkName = login.getClerkName();
-        List<TabHaobanRoleMenu> tabHaobanRoleMenus = new ArrayList<>();
-        Date now = new Date();
-        //导购
-        if (clerkMenus != null) {
-            TabHaobanRole tabHaobanRole = updateTabHaobanRole(haobanRoleQDTO, clerkMenus, wxEnterpriseId, clerkId, clerkName, now);
-            List<String> menuCodes = clerkMenus.getMenuCodes();
-            for (String menuCode : menuCodes) {
-                getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
             }
         }
 
@@ -187,15 +154,27 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             for (String menuCode : menuCodes) {
                 getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
             }
+            if (systemFlag == 0) {
+                List<String> delMenuCodes = manegeClerkMenus.getDelMenuCodes();
+                for (String delMenuCode : delMenuCodes) {
+                    haobanRoleMenuService.deleteByMenuCode(delMenuCode,wxEnterpriseId);
+                }
+            }
         }
 
-        //导购
+        //区经
         if (managerMenus != null) {
             TabHaobanRole tabHaobanRole = updateTabHaobanRole(haobanRoleQDTO, managerMenus, wxEnterpriseId, clerkId, clerkName, now);
             List<String> menuCodes = managerMenus.getMenuCodes();
             for (String menuCode : menuCodes) {
                 getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
             }
+            if (systemFlag == 0) {
+                List<String> delMenuCodes = managerMenus.getDelMenuCodes();
+                for (String delMenuCode : delMenuCodes) {
+                    haobanRoleMenuService.deleteByMenuCode(delMenuCode,wxEnterpriseId);
+                }
+            }
         }
         haobanRoleMenuService.insertBatch(tabHaobanRoleMenus);
         return ServiceResponse.success();
@@ -218,7 +197,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         tabHaobanRole.setStatusFlag(1);
         tabHaobanRole.setUpdateTime(now);
         haobanRoleService.update(tabHaobanRole);
-        return tabHaobanRole;
+        return haobanRoleService.queryById(roleId);
     }
 
 

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

@@ -98,4 +98,16 @@ public interface HaobanRoleMenuService {
      * @date 2022-10-09 14:20:25
      */
     List<String> getMenuNotInMenuCodes(String wxEnterpriseId, Long roleId, List<String> menuCodes);
+
+
+    /**
+     * 根据code删除
+     *
+     * @param menuCode       菜单代码
+     * @param wxEnterpriseId wx企业标识
+     * @return boolean
+     * @author mozhu
+     * @date 2022-10-10 10:44:23
+     */
+    boolean deleteByMenuCode(String menuCode,String wxEnterpriseId);
 }

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

@@ -83,7 +83,7 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
 
     @Override
     public List<String> getByWxEnterpriseIdAndRoleId(String wxEnterpriseId, Long roleId) {
-        return tabHaobanRoleMenuMapper.getByWxEnterpriseIdAndRoleId(wxEnterpriseId,roleId);
+        return tabHaobanRoleMenuMapper.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, roleId);
     }
 
     @Override
@@ -93,6 +93,12 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
 
     @Override
     public List<String> getMenuNotInMenuCodes(String wxEnterpriseId, Long roleId, List<String> menuCodes) {
-        return tabHaobanRoleMenuMapper.getMenuNotInMenuCodes(wxEnterpriseId,roleId,menuCodes);
+        return tabHaobanRoleMenuMapper.getMenuNotInMenuCodes(wxEnterpriseId, roleId, menuCodes);
+    }
+
+
+    @Override
+    public boolean deleteByMenuCode(String menuCode, String wxEnterpriseId) {
+        return tabHaobanRoleMenuMapper.deleteByMenuCode(menuCode, wxEnterpriseId) > 0;
     }
 }

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -128,7 +128,8 @@
         a.store_id storeId,
         a.clerk_id clerkId,
         a.clerk_code clerkCode,
-        a.status_flag statusFlag
+        a.status_flag statusFlag,
+        a.manage_flag manageFlag
         from tab_haoban_staff_clerk_relation a
         left join tab_haoban_staff b on b.staff_id = a.staff_id
         where a.status_flag=1

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanRoleMenuMapper.xml

@@ -100,5 +100,9 @@
         </foreach>
     </select>
 
+    <delete id="deleteByMenuCode">
+        delete from tab_haoban_role_menu where wx_enterprise_id = #{wxEnterpriseId} and menu_code = #{menuCode}
+    </delete>
+
 </mapper>
 

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

@@ -62,7 +62,7 @@ public class HaobanRoleController extends WebBaseController {
     public RestResponse edit(@RequestBody HaobanRoleQDTO haobanRoleQDTO) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         StringBuffer logContent = getEditLog(haobanRoleQDTO, login);
-
+        haobanRoleQDTO.setSystemFlag(1);
         ServiceResponse serviceResponse = haobanRoleApiService.edit(haobanRoleQDTO, login);
         if (!serviceResponse.isSuccess()) {
             GicLogRecordEvaluationContext.noWriteLog();