From fd3c95076d32c5abcf05d9331ed7bbc437ed2afc Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 23 Jul 2020 18:42:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E3=80=90=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2=E5=88=A4=E6=96=AD=E3=80=91?=
 =?UTF-8?q?=20=E9=AD=8F=E5=87=AF=202020-07-23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/service/impl/SysRoleServiceImpl.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
index c08f058cd..99637cd52 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
+++ b/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);
 

From 356e67a270328d71f7d3e1b08afbc13b08441e6c Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Fri, 24 Jul 2020 09:51:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=87=E9=A2=98=E3=80=91=20=E9=AD=8F=E5=87=AF=20202?=
 =?UTF-8?q?0-07-24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/epidemic/excel/EpidemicExcel.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java
index 63fd7469c..8df4dc69e 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java
+++ b/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 = "上报人")
-    private String reporter;
-
-    @Excel(name = "上报人电话")
-    private String mobile;
+    @Excel(name = "区域名称")
+    private String allDeptNames;
 
     @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;
+
 
-}
\ No newline at end of file
+}