Merge remote-tracking branch 'origin/bugfix/2023-04-11' into developer

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

@@ -162,7 +162,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 List<String> delMenuCodes = clerkMenus.getDelMenuCodes();
                 for (String delMenuCode : delMenuCodes) {
                     //需要删除好办后台的菜单按钮
-                    HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 0, systemFlag);
+                    HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 0, 1);
                     if (haobanRoleBO != null){
                         haobanRoleMenuService.deleteByMenuCodeAndRoleId(delMenuCode, wxEnterpriseId,haobanRoleBO.getRoleId());
                     }
@@ -181,7 +181,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 List<String> delMenuCodes = manegeClerkMenus.getDelMenuCodes();
                 for (String delMenuCode : delMenuCodes) {
                     //需要删除好办后台的菜单按钮
-                    HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 1, systemFlag);
+                    HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 1, 1);
                     if (haobanRoleBO != null){
                         haobanRoleMenuService.deleteByMenuCodeAndRoleId(delMenuCode, wxEnterpriseId,haobanRoleBO.getRoleId());
                     }
@@ -200,7 +200,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 List<String> delMenuCodes = managerMenus.getDelMenuCodes();
                 for (String delMenuCode : delMenuCodes) {
                     //需要删除好办后台的菜单按钮
-                    HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 2, systemFlag);
+                    HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 2, 1);
                     if (haobanRoleBO != null){
                         haobanRoleMenuService.deleteByMenuCodeAndRoleId(delMenuCode, wxEnterpriseId,haobanRoleBO.getRoleId());
                     }