Antiloveg 8 years ago
parent
commit
00ca646970

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

@@ -125,10 +125,10 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (null == userIdentity.getLevel()) {
+		/*if (null == userIdentity.getLevel()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户等级", "用户等级"));
 			return res;
-		}
+		}*/
 
 		if (!UserLevel.GENERAL.getCode().equals(userIdentity.getLevel())
 				|| IdentityAuditStatus.PASSED.getCode().equals(userIdentity.getAuditStatus())) {

+ 5 - 4
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -353,12 +353,13 @@
   
    <select id="selectUserByAid" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgListBo">
     select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus, a.name as adminName, u.type,
-  	       o.unit_name as unitName
+  	       u.number , o.aft_username as aftUsername, o.audit_status as orgAuditStatus, a.name as adminName, u.type,
+  	       o.unit_name as unitName, i.username, u.audit_status userAuditStatus
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
-	LEFT JOIN organization_identity o 
-    ON u.id = o.uid 
+	LEFT JOIN organization_identity o  ON u.id = o.uid 
+	LEFT JOIN user_identity i on u.id = i.uid
+   
     where u.aid = #{aid,jdbcType=VARCHAR}
   </select>
   

+ 62 - 46
src/main/java/com/goafanti/user/bo/OrgListBo.java

@@ -9,29 +9,39 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class OrgListBo {
-    private String id;
-	
-    private	String mobile;
-    
-    private String email;
-    
-    private Date createTime;
-    
-    private Integer number;
-    
-    private String aftUsername;
-    
-    private Integer auditStatus;
-    
-    private String adminName;
-    
-    private String unitName;
-    
-    private Integer type;
-    
-    private String managerName;
-    
-    
+	private String	id;
+
+	private String	mobile;
+
+	private String	email;
+
+	private Date	createTime;
+
+	private Integer	number;
+
+	private String	aftUsername;
+
+	private Integer	orgAuditStatus;
+
+	private String	adminName;
+
+	private String	unitName;
+
+	private Integer	type;
+
+	private String	managerName;
+
+	private String	username;
+
+	private Integer	userAuditStatus;
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
 
 	public String getManagerName() {
 		return managerName;
@@ -89,15 +99,6 @@ public class OrgListBo {
 		this.aftUsername = aftUsername;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
-	public Integer getAuditStatus() {
-		return auditStatus;
-	}
-
-	public void setAuditStatus(Integer auditStatus) {
-		this.auditStatus = auditStatus;
-	}
-	
 	public String getAdminName() {
 		return adminName;
 	}
@@ -105,8 +106,6 @@ public class OrgListBo {
 	public void setAdminName(String adminName) {
 		this.adminName = adminName;
 	}
-	
-	
 
 	public String getUnitName() {
 		return unitName;
@@ -115,8 +114,7 @@ public class OrgListBo {
 	public void setUnitName(String unitName) {
 		this.unitName = unitName;
 	}
-	
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getType() {
 		return type;
@@ -125,18 +123,36 @@ public class OrgListBo {
 	public void setType(Integer type) {
 		this.type = type;
 	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getOrgAuditStatus() {
+		return orgAuditStatus;
+	}
 
-	//注册时间
-	public String getCreateTimeFormattedDate(){
+	public void setOrgAuditStatus(Integer orgAuditStatus) {
+		this.orgAuditStatus = orgAuditStatus;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getUserAuditStatus() {
+		return userAuditStatus;
+	}
+
+	public void setUserAuditStatus(Integer userAuditStatus) {
+		this.userAuditStatus = userAuditStatus;
+	}
+
+	// 注册时间
+	public String getCreateTimeFormattedDate() {
 		if (this.createTime == null) {
-			 return null;
-		   } else {
-			 return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
-		   }
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+		}
 	}
-			
-	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
-				
+
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+
 	}
-    
+
 }

+ 3 - 2
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -119,9 +119,10 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 			createNotice(user, ui.getAuditStatus());
 		}
 		if (IdentityAuditStatus.PASSED.getCode().equals(ui.getAuditStatus())) {
-			if (UserLevel.GENERAL.getCode().equals(level)) {
+			/*if (UserLevel.GENERAL.getCode().equals(level)) {
 				user.setLvl(UserLevel.CERTIFIED.getCode());
-			}
+			}*/
+			user.setLvl(UserLevel.CERTIFIED.getCode());
 			user.setAid(aid);
 			user.setMid(mid);
 			userMapper.updateByPrimaryKeySelective(user);