Antiloveg 8 years ago
parent
commit
16e1a0983c

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -457,7 +457,7 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		res.setData(userIdentityService.selectUserIdentityByUserId(uid));
+		res.setData(userIdentityService.selectUserIdentityByUserIdAdmin(uid));
 		return res;
 	}
 
@@ -558,7 +558,7 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		res.setData(organizationIdentityService.selectOrgIdentityDetailByUserId(uid));
+		res.setData(organizationIdentityService.selectOrgIdentityDetailByUserIdAdmin(uid));
 		return res;
 	}
 

+ 17 - 0
src/main/java/com/goafanti/user/bo/OrgIdentityDetailAdmin.java

@@ -0,0 +1,17 @@
+package com.goafanti.user.bo;
+
+import com.goafanti.common.model.OrganizationIdentity;
+
+public class OrgIdentityDetailAdmin extends OrganizationIdentity {
+	private Integer level;
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	
+	
+}

+ 17 - 0
src/main/java/com/goafanti/user/bo/UserIdentityDetailAdminBo.java

@@ -0,0 +1,17 @@
+package com.goafanti.user.bo;
+
+import com.goafanti.common.model.UserIdentity;
+
+public class UserIdentityDetailAdminBo extends UserIdentity {
+	private Integer level;
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	
+	
+}

+ 3 - 0
src/main/java/com/goafanti/user/service/OrganizationIdentityService.java

@@ -11,6 +11,7 @@ import com.goafanti.portal.bo.OrgSubscriberListBo;
 import com.goafanti.user.bo.AuditorOrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.OrgIdentityDetailAdmin;
 import com.goafanti.user.bo.OrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
 
@@ -47,4 +48,6 @@ public interface OrganizationIdentityService {
 	Pagination<OrgSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
 			Integer area, Integer pNo, Integer pSize);
 
+	OrgIdentityDetailAdmin selectOrgIdentityDetailByUserIdAdmin(String uid);
+
 }

+ 3 - 0
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -6,6 +6,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.portal.bo.UserSubscriberListBo;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
 import com.goafanti.user.bo.UserIdentityBo;
+import com.goafanti.user.bo.UserIdentityDetailAdminBo;
 
 public interface UserIdentityService {
 
@@ -32,4 +33,6 @@ public interface UserIdentityService {
 	Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
 			Integer area, Integer pNo, Integer pSize);
 
+	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);
+
 }

+ 12 - 0
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.TreeMap;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,6 +39,7 @@ import com.goafanti.portal.bo.OrgSubscriberListBo;
 import com.goafanti.user.bo.AuditorOrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.OrgIdentityDetailAdmin;
 import com.goafanti.user.bo.OrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.service.OrganizationIdentityService;
@@ -343,4 +345,14 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		noticeMapper.insert(n);
 	}
 
+	@Override
+	public OrgIdentityDetailAdmin selectOrgIdentityDetailByUserIdAdmin(String uid) {
+		OrganizationIdentity o = organizationIdentityMapper.selectOrgIdentityByUserId(uid);
+		User u = userMapper.selectByPrimaryKey(uid);
+		OrgIdentityDetailAdmin bo = new OrgIdentityDetailAdmin();
+		BeanUtils.copyProperties(o, bo);
+		bo.setLevel(u.getLvl());
+		return bo;
+	}
+
 }

+ 12 - 0
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.portal.bo.UserSubscriberListBo;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
 import com.goafanti.user.bo.UserIdentityBo;
+import com.goafanti.user.bo.UserIdentityDetailAdminBo;
 import com.goafanti.user.service.UserIdentityService;
 
 @Service
@@ -260,4 +262,14 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		noticeMapper.insert(n);
 	}
 
+	@Override
+	public UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid) {
+		UserIdentity ui =  userIdentityMapper.selectUserIdentityByUserId(uid);
+		User u = userMapper.selectByPrimaryKey(uid);
+		UserIdentityDetailAdminBo bo = new UserIdentityDetailAdminBo();
+		BeanUtils.copyProperties(ui, bo);
+		bo.setLevel(u.getLvl());
+		return bo;
+	}
+
 }