好办小程序权限调整

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.role.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.role.TabHaobanMenuMapper;
 import com.gic.haoban.manage.service.dao.mapper.role.TabHaobanRoleMapper;
@@ -20,10 +21,7 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author mozhu
@@ -183,8 +181,8 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
 
     @Override
     public void saveMenuFromGicNoitic(String enterpriseId) {
-        List<String> menuCodeList = new ArrayList<>();
-        List<Integer> addRoleTypeList = new ArrayList<>();
+        List<String> menuCodeList = Arrays.asList("1123") ;
+        List<Integer> addRoleTypeList = Arrays.asList(0,1,2);
         logger.info("保存菜单={}",enterpriseId);
         List<TabHaobanWxEnterpriseRelated> wxEnterpriseList = this.wxEnterpriseRelatedMapper.listByEnterpriseId(enterpriseId) ;
         logger.info("gic关联的企微={}", JSONObject.toJSONString(wxEnterpriseList));
@@ -199,11 +197,12 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
                 for(TabHaobanRole role : list) {
                     Long roleId = role.getRoleId() ;
                     int roleType = role.getClerkType() ;
-                    if(addRoleTypeList.contains(roleType)) {
+                    if(!addRoleTypeList.contains(roleType)) {
                         continue;
                     }
                     for(String menuCode : menuCodeList) {
                         menu = new TabHaobanRoleMenu() ;
+                        menu.setRoleMenuId(UniqueIdUtils.uniqueLong());
                         menu.setRoleId(roleId);
                         menu.setUpdateTime(now);
                         menu.setCreateTime(now);
@@ -213,6 +212,7 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
                         insertMenuList.add(menu) ;
                     }
                 }
+
                 if(CollectionUtils.isNotEmpty(insertMenuList)) {
                     this.roleMenuMapper.insertBatch(insertMenuList);
                 }