update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/OrganizationController.java

@@ -1,6 +1,8 @@
 package com.keao.edu.user.controller;
 
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
+import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
@@ -23,11 +25,15 @@ public class OrganizationController extends BaseController {
 
 	@Autowired
 	private OrganizationService organizationService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@ApiOperation(value = "合作单位列表")
 	@GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('organization/list')")
 	public HttpResponseResult<PageInfo<Organization>> configList(OrganizationQueryInfo queryInfo) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		queryInfo.setParentId(sysUser.getId());
 		return succeed(organizationService.queryPage(queryInfo));
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/OrganizationQueryInfo.java

@@ -6,6 +6,16 @@ public class OrganizationQueryInfo extends QueryInfo {
 
     private String settlementType;
 
+    private Integer parentId;
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
     public String getSettlementType() {
         return settlementType;
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -59,6 +59,12 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUser.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		organ.setParentOrganId(queryUserInfo.getId());
+		organ.setLevel(currentOrganization.getLevel() + 1);
+		if(StringUtils.isEmpty(currentOrganization.getParentOrganIdTag())){
+			organ.setParentOrganIdTag(queryUserInfo.getId().toString());
+		}else {
+			organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + queryUserInfo.getId());
+		}
 		if(user != null && user.getId() != null){
 			Organization organization = organDao.get(user.getId());
 			if(organization == null){
@@ -68,7 +74,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				organ.setId(user.getId());
 				organDao.insert(organ);
 				//新增用户角色
-				sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
+				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+					sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
+				}
 				user.setUserType(user.getUserType() + ",ORGAN");
 				user.setRealName(organ.getName());
 				user.setPhone(organ.getContactPhone());
@@ -87,11 +95,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUser.setPhone(organ.getContactPhone());
 		sysUserDao.insert(sysUser);
 
-		if(StringUtils.isEmpty(currentOrganization.getParentOrganIdTag())){
-			organ.setParentOrganIdTag(queryUserInfo.getId().toString());
-		}else {
-			organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + queryUserInfo.getId());
-		}
 		organ.setId(sysUser.getId());
 		organDao.insert(organ);
 		//新增用户角色