Merge branch 'meiteng' of ssh://103.249.252.28:10022/lcy/education into meiteng

src/main/java/org/rcisoft/core/aop/CurUserAspect.java

@@ -68,21 +68,23 @@ public class CurUserAspect {
             throw new ServiceException(ResultExceptionEnum.USER_NO_AUTHEN);
         UserUtil.setCurUser(curUser);
 
-        //查询本部门是否有管理员
-        int countAdmin = sysRoleService.queryAdminInCorp(curUser.getCorpId());
-        if (countAdmin==0){
-            //随机生成角色Id
+        synchronized (this) {
+            //查询本部门是否有管理员
+            int countAdmin = sysRoleService.queryAdminInCorp(curUser.getCorpId());
+            if (countAdmin == 0) {
+                //随机生成角色Id
 
-            log.info("--------------------该企业正在初始化--------------------");
+                log.info("--------------------该企业正在初始化--------------------");
 
-            // 同步企业人员
-            int line = userServiceImpl.synchronizedUsers(curUser.getCorpId());
-            //初始化角色
-            int userRoleResult = sysRoleService.addAdminRoleMenuUser(curUser);
-            // 初始化数据字典表
-            sysRoleService.initDictionary();
+                // 同步企业人员
+                int line = userServiceImpl.synchronizedUsers(curUser.getCorpId());
+                //初始化角色
+                int userRoleResult = sysRoleService.addAdminRoleMenuUser(curUser);
+                // 初始化数据字典表
+                sysRoleService.initDictionary();
 
-            log.info("--------------------初始化完成--------------------");
+                log.info("--------------------初始化完成--------------------");
+            }
         }
     }