Merge branch 'bugfix/2023-04-11' into 'master'

Bugfix/2023 04 11

See merge request !1137

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

@@ -58,6 +58,6 @@ public interface TabHaobanRoleMenuMapper {
                                        @Param("roleId") Long roleId,
                                        @Param("menuCodes")  List<String> menuCodes);
 
-    int deleteByMenuCode(@Param("menuCode") String menuCode, @Param("wxEnterpriseId") String wxEnterpriseId);
+    int deleteByMenuCodeAndRoleId(@Param("menuCode") String menuCode, @Param("wxEnterpriseId") String wxEnterpriseId,@Param("roleId") Long roleId);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/LicenceOrderApiServiceImpl.java

@@ -52,6 +52,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @description:
@@ -434,6 +435,8 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
         if (CollUtil.isEmpty(list)){
             return ServiceResponse.success(map);
         }
+        //去重
+        list = list.stream().distinct().collect(Collectors.toList());
         Integer count = licenceOrderService.selectCountByWxEnterpriseId(wxEnterpriseId);
         if (count==0){
             StaffActiveDataDTO dto  = wxEnterpriseActiveDataService.getWxEnterpriseActiveDataByWxEnterpriseId(wxEnterpriseId);

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

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

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

@@ -73,10 +73,11 @@ public interface HaobanRoleMenuService {
      *
      * @param menuCode       菜单代码
      * @param wxEnterpriseId wx企业标识
+     * @param roleId 角色id
      * @return boolean
      * @author mozhu
      * @date 2022-10-10 10:44:23
      */
-    boolean deleteByMenuCode(String menuCode,String wxEnterpriseId);
+    boolean deleteByMenuCodeAndRoleId(String menuCode,String wxEnterpriseId,Long roleId);
 
 }

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

@@ -50,7 +50,7 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
 
 
     @Override
-    public boolean deleteByMenuCode(String menuCode, String wxEnterpriseId) {
-        return tabHaobanRoleMenuMapper.deleteByMenuCode(menuCode, wxEnterpriseId) > 0;
+    public boolean deleteByMenuCodeAndRoleId(String menuCode, String wxEnterpriseId,Long roleId) {
+        return tabHaobanRoleMenuMapper.deleteByMenuCodeAndRoleId(menuCode, wxEnterpriseId,roleId) > 0;
     }
 }

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

@@ -52,8 +52,8 @@
         </foreach>
     </select>
 
-    <delete id="deleteByMenuCode">
-        delete from tab_haoban_role_menu where wx_enterprise_id = #{wxEnterpriseId} and menu_code = #{menuCode}
+    <delete id="deleteByMenuCodeAndRoleId">
+        delete from tab_haoban_role_menu where wx_enterprise_id = #{wxEnterpriseId} and menu_code = #{menuCode} and role_id = #{roleId}
     </delete>
 
 </mapper>

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

@@ -476,9 +476,7 @@ public class StaffController extends WebBaseController {
     public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, Integer relationFlag, String keyWord, String permitState,BasePageInfo pageInfo) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
-        boolean needDep = true ;
         if(StringUtils.isBlank(departmentId)){
-            needDep = false ;
             DepartmentDTO dto = this.departmentApiService.getRootByEnterpriseId(wxEnterpriseId) ;
             departmentId = dto.getDepartmentId() ;
         }
@@ -486,10 +484,8 @@ public class StaffController extends WebBaseController {
         departmentIdSet.add(departmentId);
         List<DepartmentDTO> relationList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId);
         Map<String, DepartmentDTO>  departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, s -> s));
-        List<String> departmentIds = new ArrayList<>();
-        if(needDep) {
-            departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
-        }
+        List<String> departmentIds ;
+        departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
         List<StaffDTO> staffAllList = Lists.newArrayListWithCapacity(5000);
         pageInfo.setPageSize(Integer.MAX_VALUE);
         int pageNum = 1;