From ddc00ef68497937331c454b043e4ad3baaf7eb6a Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 16 Jun 2022 09:34:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index fa32b479c..0a1fe46f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -746,7 +746,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl list = new ArrayList<>(); if (workbook != null) { Sheet sheet = workbook.getSheetAt(0); - deleteBlankRow(sheet); + //deleteBlankRow(sheet); if (sheet != null) { if(sheet.getPhysicalNumberOfRows()==0){ if (CutEnum.CN.getValue().equals(cut)) { @@ -791,27 +791,27 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl 1) {//读取数据 //获取每一行数据 row = sheet.getRow(i); From d4026309259c71d8cd8ea0229e2455006eb2f2b6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 16 Jun 2022 09:46:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?opensso=E7=99=BB=E5=BD=95-=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/opensso/controller/SSOLoginController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java index 234dfd7ef..271251b94 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java @@ -14,6 +14,7 @@ import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.config.entity.SysConfig; import com.jero.modules.config.service.ISysConfigService; import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDictService; @@ -198,6 +199,11 @@ public class SSOLoginController { // update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去 obj.put("multi_depart", 2); } + + // 获取用户角色信息 + List userRoleListInfo = sysUserService.queryUserRoleListInfoByUserId(sysUser.getId()); + sysUser.setUserRoleList(userRoleListInfo); + //获取配置信息 List sysConfigs = iSysConfigService.queryList(); if(CollectionUtils.isNotEmpty(sysConfigs)){ From 623d81938d09cda29b76b1ee040715c24f36bb6c Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 16 Jun 2022 09:48:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=BF=87=E6=9D=A5=E7=9A=84=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?id=E4=B8=8D=E5=90=8C=EF=BC=8Cusername=E7=9B=B8=E5=90=8C,?= =?UTF-8?q?=E8=BF=9D=E8=83=8C=E7=94=A8=E6=88=B7=E5=90=8D=E5=8D=95=E4=B8=80?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SyncDataServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index 69f0ecfab..4dd1f1c3d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -195,6 +195,8 @@ public class SyncDataServiceImpl implements ISyncDataService{ ppEmployeeList.addAll(currentPPEmployeeList); } } + // 处理同步过来的数据id不同，username相同的情况 + ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed()); //此处获取全部pp用户信息 List sysUserList = sysUserService.getPPEmployeeList();