Merge remote-tracking branch 'origin/lixuetao' into lixuetao

adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java

@@ -157,21 +157,12 @@ public class MenuEOController extends BaseController<MenuEO> {
 
         if (roleId != null && !"".equals(roleId)) {
             roleMenuEOPage.setRoleId(roleId);
-            RoleEO roleEO = roleEOService.selectByPrimaryKey(roleId);
-            if ("管理员".equals(roleEO.getName())) {
-               menuVOs.forEach(menuVO -> {
-                   if (!"1".equals(menuVO.getIsButton())) {
-                       menuVO.setBelong(IsBelongEnum.BELONG.getValue());
-                   }
-               });
-            }else{
-                List<RoleMenuEO> roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage);
-                for (MenuVO menuVO : menuVOs) {
-                    for (RoleMenuEO roleMenuEO : roleMenuEOList){
-                        if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId()) && !"1".equals(menuVO.getIsButton())){
-                            menuVO.setBelong(IsBelongEnum.BELONG.getValue());
-                            break;
-                        }
+            List<RoleMenuEO> roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage);
+            for (MenuVO menuVO : menuVOs) {
+                for (RoleMenuEO roleMenuEO : roleMenuEOList){
+                    if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId())){
+                        menuVO.setBelong(IsBelongEnum.BELONG.getValue());
+                        break;
                     }
                 }
             }

adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java

@@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.UUID;
 
 @Service("orgEOService")
 @Transactional
@@ -73,6 +72,7 @@ public class OrgEOService extends ServiceImpl<OrgEODao, OrgEO> implements IOrgEo
             orgEO.setId(orgEO.getDepartmentCode());
             baseMapper.insert(orgEO);
         }else{
+            orgEO.setId(orgEO.getOrgCode());
             baseMapper.updateById(orgEO);
         }
         return Result.success();

adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml

@@ -18,11 +18,12 @@
         <result column="remarks" property="remarks"/>
         <result column="sort" property="sort"/>
         <result column="ext_info" property="extInfo" />
+        <result column="is_button" property="isButton" />
     </resultMap>
 
     <!-- TS_MENU table all fields -->
     <sql id="Base_Column_List">
-        id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url
+        id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url,is_button
     </sql>
 
     <!-- 用于按名称查询记录时的sql，添加前缀TS_MENU -->