fix：初始化调整

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

@@ -16,5 +16,5 @@ public interface ApplicationSettingApiService {
 
 	List<ApplicationSettingDTO> listOpenByWxEnterpriseIdAndApplicationIds(String wxEnterpriseId,List<String> applicationIds);
 
-	List<String> findMenuCodes(String wxEnterpriseId);
+	List<String> findMenuCodes(String wxEnterpriseId,Integer openFlag);
 }

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

@@ -24,5 +24,5 @@ public interface ApplicationSettingMapper {
     
     List<TabHaobanApplicationSetting> listOpenByWxEnterpriseIdAndApplicationIds(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("applicationIds")List<String> applicationIds);
 
-    List<String> findMenuCodes(String wxEnterpriseId);
+    List<String> findMenuCodes(@Param("wxEnterpriseId") String wxEnterpriseId,@Param("openFlag")int openFlag);
 }
\ No newline at end of file

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

@@ -73,7 +73,7 @@ public class ApplicationSettingApiServiceImpl implements ApplicationSettingApiSe
     }
 
     @Override
-    public List<String> findMenuCodes(String wxEnterpriseId) {
-        return applicationSettingMapper.findMenuCodes(wxEnterpriseId);
+    public List<String> findMenuCodes(String wxEnterpriseId,Integer openFlag) {
+        return applicationSettingMapper.findMenuCodes(wxEnterpriseId,openFlag);
     }
 }

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

@@ -30,7 +30,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
@@ -142,7 +141,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) {
                 List<String> delMenuCodes = clerkMenus.getDelMenuCodes();
                 for (String delMenuCode : delMenuCodes) {
-                    haobanRoleMenuService.deleteByMenuCode(delMenuCode,wxEnterpriseId);
+                    haobanRoleMenuService.deleteByMenuCode(delMenuCode, wxEnterpriseId);
                 }
             }
         }
@@ -157,7 +156,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) {
                 List<String> delMenuCodes = manegeClerkMenus.getDelMenuCodes();
                 for (String delMenuCode : delMenuCodes) {
-                    haobanRoleMenuService.deleteByMenuCode(delMenuCode,wxEnterpriseId);
+                    haobanRoleMenuService.deleteByMenuCode(delMenuCode, wxEnterpriseId);
                 }
             }
         }
@@ -172,7 +171,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) {
                 List<String> delMenuCodes = managerMenus.getDelMenuCodes();
                 for (String delMenuCode : delMenuCodes) {
-                    haobanRoleMenuService.deleteByMenuCode(delMenuCode,wxEnterpriseId);
+                    haobanRoleMenuService.deleteByMenuCode(delMenuCode, wxEnterpriseId);
                 }
             }
         }
@@ -309,33 +308,50 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         List<HaobanRoleBO> haobanRoleBOList = haobanRoleService.getListByWxEnterpriseId("-1", null);
         //导购店长
         List<String> menuCodes = new ArrayList<>();
+        //运维后台 导购店长
+        List<String> ywMenuCodes = new ArrayList<>();
         //区经
         List<String> menuManageCodes = new ArrayList<>();
         if (searchFlag) {
             menuCodes.add("customerList_allSearch");
+            ywMenuCodes.add("customerList_allSearch");
             menuManageCodes.add("customerList_allSearch");
         }
         if (handoverFlag) {
             menuCodes.add("customerList_inheritCustomer");
+            ywMenuCodes.add("customerList_inheritCustomer");
         }
 
         if (addClerkFlag) {
             menuCodes.add("userCenter_addClerk");
+            ywMenuCodes.add("userCenter_addClerk");
         }
         if (editClerkFlag) {
             menuCodes.add("storeClerkList_edit");
+            ywMenuCodes.add("storeClerkList_edit");
         }
         if (delClerkFlag) {
             menuCodes.add("userCenter_delClerk");
+            ywMenuCodes.add("userCenter_delClerk");
         }
 
         menuCodes.add("workbench");
         menuCodes.add("userCenter");
         menuCodes.add("dataSummary");
+
+        ywMenuCodes.add("workbench");
+        ywMenuCodes.add("userCenter");
+        ywMenuCodes.add("dataSummary");
+
         //导购和店长初始化权限以好办web为准
-        List<String> menuCodesOld = applicationSettingApiService.findMenuCodes(wxEnterpriseId);
+        List<String> menuCodesOld = applicationSettingApiService.findMenuCodes(wxEnterpriseId, 1);
         List<String> clerkMenuCodes = haobanMenuService.getHaobanMenuByPid(menuCodesOld);
         menuCodes.addAll(clerkMenuCodes);
+
+        List<String> ywMenuCodesOld = applicationSettingApiService.findMenuCodes(wxEnterpriseId, null);
+        List<String> ywClerkMenuCodes = haobanMenuService.getHaobanMenuByPid(ywMenuCodesOld);
+        ywMenuCodes.addAll(ywClerkMenuCodes);
+
         HaobanRoleQDTO haobanRoleQDTO = new HaobanRoleQDTO();
         HaobanRoleQDTO haobanRoleSystemQDTO = new HaobanRoleQDTO();
         int count = haobanRoleService.getCountByWxEnterpriseId(wxEnterpriseId, null);
@@ -350,29 +366,46 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             String roleName = haobanRoleBO.getRoleName();
             haobanRoleQDTO.setRoleName(roleName);
             haobanRoleSystemQDTO.setRoleName(roleName);
+
             haobanRoleQDTO.setSystemFlag(1);
             haobanRoleSystemQDTO.setSystemFlag(0);
 
             if (RoleClerkTypeEnum.CLERK.getCode().equals(clerkType)) {
+                //导购
                 //初始化我的
                 List<String> userCenter = haobanMenuService.getHaobanMenuByPid(Collections.singletonList("userCenter"));
-                List<String> menuList = haobanRoleMenuService.getMenuInMenuCodes("-1", roleId,userCenter );
+                List<String> menuList = haobanRoleMenuService.getMenuInMenuCodes("-1", roleId, userCenter);
                 List<String> codes = RolesListUtils.unionList(menuList, menuCodes);
-                Set<String> unionListcodes = codes.stream().collect(Collectors.toSet());
+                List<String> ywCodes = RolesListUtils.unionList(menuList, ywMenuCodes);
+
                 HaobanRoleMenuQDTO clerkMenus = new HaobanRoleMenuQDTO();
                 clerkMenus.setClerkType(clerkType);
-                clerkMenus.setMenuCodes(unionListcodes.stream().collect(Collectors.toList()));
+                clerkMenus.setMenuCodes(new ArrayList<>(new HashSet<>(codes)));
                 haobanRoleQDTO.setClerkMenus(clerkMenus);
-                haobanRoleSystemQDTO.setClerkMenus(clerkMenus);
+
+                HaobanRoleMenuQDTO ywClerkMenus = new HaobanRoleMenuQDTO();
+                ywClerkMenus.setClerkType(clerkType);
+                ywClerkMenus.setMenuCodes(new ArrayList<>(new HashSet<>(ywCodes)));
+                haobanRoleSystemQDTO.setClerkMenus(ywClerkMenus);
+
             } else if (RoleClerkTypeEnum.SHOP.getCode().equals(clerkType)) {
+                //店长
+                //我的
                 List<String> userCenter = haobanMenuService.getHaobanMenuByPid(Collections.singletonList("userCenter"));
-                List<String> menuList = haobanRoleMenuService.getMenuInMenuCodes("-1", roleId,userCenter);
+                List<String> menuList = haobanRoleMenuService.getMenuInMenuCodes("-1", roleId, userCenter);
                 List<String> unionListcodes = RolesListUtils.unionList(menuList, menuCodes);
+                List<String> ywUnionListcodes = RolesListUtils.unionList(menuList, ywMenuCodes);
+
                 HaobanRoleMenuQDTO manegeClerkMenus = new HaobanRoleMenuQDTO();
                 manegeClerkMenus.setClerkType(clerkType);
-                manegeClerkMenus.setMenuCodes(unionListcodes.stream().collect(Collectors.toList()));
+                manegeClerkMenus.setMenuCodes(new ArrayList<>(new HashSet<>(unionListcodes)));
                 haobanRoleQDTO.setManegeClerkMenus(manegeClerkMenus);
-                haobanRoleSystemQDTO.setManegeClerkMenus(manegeClerkMenus);
+
+                HaobanRoleMenuQDTO ywManegeClerkMenus = new HaobanRoleMenuQDTO();
+                ywManegeClerkMenus.setClerkType(clerkType);
+                ywManegeClerkMenus.setMenuCodes(new ArrayList<>(new HashSet<>(ywUnionListcodes)));
+                haobanRoleSystemQDTO.setManegeClerkMenus(ywManegeClerkMenus);
+
             } else if (RoleClerkTypeEnum.MANAGE.getCode().equals(clerkType)) {
                 List<String> manageCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
                 menuManageCodes.addAll(manageCodes);
@@ -381,6 +414,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 managerMenus.setClerkType(clerkType);
                 managerMenus.setMenuCodes(menuManageCodes);
                 haobanRoleQDTO.setManagerMenus(managerMenus);
+
                 haobanRoleSystemQDTO.setManagerMenus(managerMenus);
             }
         }

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

@@ -11,7 +11,8 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
     </resultMap>
     <sql id="Base_Column_List">
-    setting_id, application_id, wx_enterprise_id, status_flag, open_flag, create_time, 
+        setting_id
+        , application_id, wx_enterprise_id, status_flag, open_flag, create_time,
     update_time
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
@@ -21,7 +22,8 @@
         where setting_id = #{settingId,jdbcType=VARCHAR}
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from tab_haoban_application_setting
+        delete
+        from tab_haoban_application_setting
         where setting_id = #{settingId,jdbcType=VARCHAR}
     </delete>
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanApplicationSetting">
@@ -151,13 +153,16 @@
     </select>
 
     <select id="findMenuCodes" resultType="java.lang.String">
-    select
-    b.menu_code
+        select b.menu_code
         from tab_haoban_application_setting a
                  left join tab_haoban_application b on a.application_id = b.application_id
         where a.wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
           AND a.status_flag = 1
-	AND a.open_flag = 1 and b.status_flag = 1 and b.menu_code is not null;
+          <if test="openFlag != null ">
+              AND a.open_flag = #{openFlag}
+          </if>
+          and b.status_flag = 1
+          and b.menu_code is not null;
     </select>