Merge branch 'hotfix/pcBug'

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);
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java

@@ -31,11 +31,8 @@ import java.util.Date;
 @Data
 public class EpidemicExcel {
 
-    @Excel(name = "上报人")
+    @Excel(name = "区域名称")
-    private String reporter;
+    private String allDeptNames;
-
-    @Excel(name = "上报人电话")
-    private String mobile;
 
     @Excel(name = "上报地点")
     private String address;
@@ -43,11 +40,14 @@ public class EpidemicExcel {
     @Excel(name = "上报内容")
     private String content;
 
-    @Excel(name = "区域名称")
-    private String allDeptNames;
-
     @Excel(name = "提交时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
+    @Excel(name = "上报人")
+    private String reporter;
+
+    @Excel(name = "电话")
+    private String mobile;
+
 
-}
+}