Commit ad675efe by 墨竹

feat:权限初始化

parent b9d82bb3
package com.gic.haoban.manage.service.dao.mapper; package com.gic.haoban.manage.service.dao.mapper;
import java.util.List; import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated; import java.util.List;
public interface TabHaobanTemplateApplicationRelatedMapper { public interface TabHaobanTemplateApplicationRelatedMapper {
int deleteByPrimaryKey(String templateApplicationRelatedId); int deleteByPrimaryKey(String templateApplicationRelatedId);
...@@ -19,8 +18,11 @@ public interface TabHaobanTemplateApplicationRelatedMapper { ...@@ -19,8 +18,11 @@ public interface TabHaobanTemplateApplicationRelatedMapper {
int updateByPrimaryKey(TabHaobanTemplateApplicationRelated record); int updateByPrimaryKey(TabHaobanTemplateApplicationRelated record);
List<TabHaobanTemplateApplicationRelated> listTemplicationApplicationByTemplateId(@Param("applicationTemplateId")String applicationTemplateId); List<TabHaobanTemplateApplicationRelated> listTemplicationApplicationByTemplateId(@Param("applicationTemplateId") String applicationTemplateId);
TabHaobanTemplateApplicationRelated selectByTemplateIdAndApplicationId(
@Param("applicationTemplateId") String applicationTemplateId,
@Param("applicationId") String applicationId);
TabHaobanTemplateApplicationRelated selectByTemplateIdAndApplicationId(@Param("applicationTemplateId")String applicationTemplateId, List<String> listMenuCodesByTemplateId(@Param("templateId") String templateId);
@Param("applicationId")String applicationId);
} }
\ No newline at end of file
...@@ -8,6 +8,7 @@ import com.gic.haoban.app.customer.service.api.service.ManageSettingApiService; ...@@ -8,6 +8,7 @@ import com.gic.haoban.app.customer.service.api.service.ManageSettingApiService;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO; import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.RolesListUtils; import com.gic.haoban.common.utils.RolesListUtils;
import com.gic.haoban.manage.api.dto.ClerkEditInfoDTO; import com.gic.haoban.manage.api.dto.ClerkEditInfoDTO;
import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO; import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO;
import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO; import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO; import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
...@@ -15,11 +16,13 @@ import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO; ...@@ -15,11 +16,13 @@ import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
import com.gic.haoban.manage.api.enums.role.RoleClerkTypeEnum; import com.gic.haoban.manage.api.enums.role.RoleClerkTypeEnum;
import com.gic.haoban.manage.api.service.ApplicationSettingApiService; import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
import com.gic.haoban.manage.api.service.role.HaobanRoleApiService; import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanTemplateApplicationRelatedMapper;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated; import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
import com.gic.haoban.manage.service.entity.role.TabHaobanRole; import com.gic.haoban.manage.service.entity.role.TabHaobanRole;
import com.gic.haoban.manage.service.entity.role.TabHaobanRoleMenu; import com.gic.haoban.manage.service.entity.role.TabHaobanRoleMenu;
import com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO; import com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO;
import com.gic.haoban.manage.service.pojo.bo.role.HaobanRoleBO; import com.gic.haoban.manage.service.pojo.bo.role.HaobanRoleBO;
import com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService;
import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService; import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
import com.gic.haoban.manage.service.service.role.HaobanMenuService; import com.gic.haoban.manage.service.service.role.HaobanMenuService;
import com.gic.haoban.manage.service.service.role.HaobanRoleMenuService; import com.gic.haoban.manage.service.service.role.HaobanRoleMenuService;
...@@ -50,6 +53,10 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService { ...@@ -50,6 +53,10 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
private ApplicationSettingApiService applicationSettingApiService; private ApplicationSettingApiService applicationSettingApiService;
@Autowired @Autowired
private HaobanMenuService haobanMenuService; private HaobanMenuService haobanMenuService;
@Autowired
private TabHaobanTemplateApplicationRelatedMapper tabHaobanTemplateApplicationRelatedMapper;
@Autowired
private TemplateEnterpriseRelatedService templateEnterpriseRelatedService;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
...@@ -281,7 +288,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService { ...@@ -281,7 +288,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
public ServiceResponse addHaobanRoleInit(String wxEnterpriseId) { public ServiceResponse addHaobanRoleInit(String wxEnterpriseId) {
List<TabHaobanWxEnterpriseRelated> enterpriseRelateds = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId); List<TabHaobanWxEnterpriseRelated> enterpriseRelateds = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
if (CollectionUtils.isEmpty(enterpriseRelateds)) { if (CollectionUtils.isEmpty(enterpriseRelateds)) {
logger.error("无关联企业:{}",wxEnterpriseId); logger.error("无关联企业:{}", wxEnterpriseId);
return ServiceResponse.success(); return ServiceResponse.success();
} }
//全品牌搜索 //全品牌搜索
...@@ -350,13 +357,19 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService { ...@@ -350,13 +357,19 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
//导购和店长初始化权限以好办web为准 //导购和店长初始化权限以好办web为准
List<String> menuCodesOld = applicationSettingApiService.findMenuCodes(wxEnterpriseId, 1); List<String> menuCodesOld = applicationSettingApiService.findMenuCodes(wxEnterpriseId, 1);
if (CollectionUtils.isEmpty(menuCodesOld)) { if (CollectionUtils.isEmpty(menuCodesOld)) {
logger.error("无权限:{}",wxEnterpriseId); logger.error("无权限:{}", wxEnterpriseId);
return ServiceResponse.success(); return ServiceResponse.success();
} }
List<String> clerkMenuCodes = haobanMenuService.getHaobanMenuByPid(menuCodesOld); List<String> clerkMenuCodes = haobanMenuService.getHaobanMenuByPid(menuCodesOld);
menuCodes.addAll(clerkMenuCodes); menuCodes.addAll(clerkMenuCodes);
List<String> ywMenuCodesOld = applicationSettingApiService.findMenuCodes(wxEnterpriseId, null); TemplateEnterpriseRelatedDTO templateEnterpriseRelatedDTO = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
if (templateEnterpriseRelatedDTO == null) {
logger.error("无模板权限:{}", wxEnterpriseId);
return ServiceResponse.success();
}
List<String> ywMenuCodesOld = tabHaobanTemplateApplicationRelatedMapper.listMenuCodesByTemplateId(templateEnterpriseRelatedDTO.getApplicationTemplateId());
List<String> ywClerkMenuCodes = haobanMenuService.getHaobanMenuByPid(ywMenuCodesOld); List<String> ywClerkMenuCodes = haobanMenuService.getHaobanMenuByPid(ywMenuCodesOld);
ywMenuCodes.addAll(ywClerkMenuCodes); ywMenuCodes.addAll(ywClerkMenuCodes);
......
...@@ -121,4 +121,18 @@ ...@@ -121,4 +121,18 @@
and application_id = #{applicationId} and application_id = #{applicationId}
and status_flag = 1 and status_flag = 1
</select> </select>
<select id="listMenuCodesByTemplateId" resultType="java.lang.String" parameterType="java.lang.String" >
SELECT
b.menu_code
FROM
tab_haoban_template_application_related a
LEFT JOIN tab_haoban_application b ON a.application_id = b.application_id
WHERE
a.template_id = #{templateId}
AND a.status_flag = 1
AND b.status_flag = 1
AND b.menu_code IS NOT NULL;
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment