【pc端-角色管理】【修改 添加角色判断】 魏凯 2020-07-23

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
@@ -85,7 +86,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value())
                 .eq(StringUtils.isNotBlank(code), "code", code)
                 .like(StringUtils.isNotBlank(name), "name", name)
-                .eq(StringUtils.isNotBlank(completeMatchName), "name", completeMatchName);
+                .eq(StringUtils.isNotBlank(completeMatchName), "name", completeMatchName)
+          .orderByDesc(FieldConstant.CREATE_DATE);
 
         // 普通管理员，只能查询所属部门及子部门的数据
         UserDetail user = SecurityUser.getUser();
@@ -168,7 +170,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     @Transactional(rollbackFor = Exception.class)
     public void update(SysRoleDTO dto) {
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
-
+        checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
         //更新角色
         updateById(entity);