Merge remote-tracking branch 'origin/master'

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<SysRole> userRoleListInfo =  sysUserService.queryUserRoleListInfoByUserId(sysUser.getId());
+        sysUser.setUserRoleList(userRoleListInfo);
+
         //获取配置信息
         List<SysConfig> sysConfigs = iSysConfigService.queryList();
         if(CollectionUtils.isNotEmpty(sysConfigs)){

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<SysUser> sysUserList = sysUserService.getPPEmployeeList();

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<ProjectRelat
 		List<ProjectRelatedPersonnel> 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<ProjectRelat
 							}
 						}
 					}
-					if (i == 1) {//校验填写说明
+//					if (i == 1) {//校验填写说明
-						row = sheet.getRow(i);
+//						row = sheet.getRow(i);
-						int columNos = row.getLastCellNum();
+//						int columNos = row.getLastCellNum();
-						if (StringUtils.isNotBlank(row.getCell(0).getStringCellValue())){
+//						if (StringUtils.isNotBlank(row.getCell(0).getStringCellValue())){
-							for (int k = 1; k < columNos; k++){
+//							for (int k = 1; k < columNos; k++){
-								if(StringUtils.isNotBlank(row.getCell(k).getStringCellValue())){
+//								if(StringUtils.isNotBlank(row.getCell(k).getStringCellValue())){
-									if (CutEnum.CN.getValue().equals(cut)) {
+//									if (CutEnum.CN.getValue().equals(cut)) {
-										throw new JeroBootException("第二行填写说明列数不对,请按照模板格式填写内容");
+//										throw new JeroBootException("第二行填写说明列数不对,请按照模板格式填写内容");
-									} else {
+//									} else {
-										throw new JeroBootException("The number of explanatory columns in the second line is incorrect. Please fill in the contents according to the template format.");
+//										throw new JeroBootException("The number of explanatory columns in the second line is incorrect. Please fill in the contents according to the template format.");
-									}
+//									}
-								}
+//								}
-							}
+//							}
-						}else {
+//						}else {
-							if (CutEnum.CN.getValue().equals(cut)) {
+//							if (CutEnum.CN.getValue().equals(cut)) {
-								throw new JeroBootException("填写说明不能为空,请按照模板格式填写内容");
+//								throw new JeroBootException("填写说明不能为空,请按照模板格式填写内容");
-							} else {
+//							} else {
-								throw new JeroBootException("The description cannot be blank. Please fill in the content according to the template format.");
+//								throw new JeroBootException("The description cannot be blank. Please fill in the content according to the template format.");
-							}
+//							}
-						}
+//						}
-					}
+//					}
 					if (i > 1) {//读取数据
 						//获取每一行数据
 						row = sheet.getRow(i);