Jelajahi Sumber

修改通过userId获取区域管理员信息时,区域管理与没有管辖区域也可以获取到管理员信息

郭超 4 tahun lalu
induk
melakukan
2317a04f4a

+ 3 - 3
core/src/main/java/com/mooctest/crowd/domain/repository/UserRepo.java

@@ -465,10 +465,10 @@ public class UserRepo implements IUserRepo {
 	private void getRegionalInfos(User user) {
 		/*获取区域管理员信息*/
 		List<RegionalManagerToRegionalPO> managerToRegionalPOList = regionalManagerToRegionalDao.findByUserIdAndIsDeleted(user.getId(), DeletedStatus.isNotDeleted);
+		RegionalManager regionalManager = new RegionalManager();
+		regionalManager.setUserId(user.getId());
 		if (managerToRegionalPOList.size() > 0) {
 			List<RegionalManagerToRegional> regionalList = new ArrayList<>();
-			RegionalManager regionalManager = new RegionalManager();
-			regionalManager.setUserId(user.getId());
 			for (RegionalManagerToRegionalPO regionalManagerToRegionalPO : managerToRegionalPOList) {
 				if (regionalManagerToRegionalPO != null) {
 					regionalManager.setId(regionalManagerToRegionalPO.getId());
@@ -478,8 +478,8 @@ public class UserRepo implements IUserRepo {
 				}
 			}
 			regionalManager.setRegionalList(regionalList);
-			user.setRegionalManager(regionalManager);
 		}
+		user.setRegionalManager(regionalManager);
 	}
 
 

+ 1 - 0
site/src/main/resources/application.yml

@@ -174,6 +174,7 @@ feature:
   task:
     import: true
     recommend: false
+    acceptedPWD: false #使用密码接收任务
 
 file:
   save:

TEMPAT SAMPAH
tool4deploy/site-0.0.1-SNAPSHOT.jar