Antiloveg 8 years ago
parent
commit
6793a251bb

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

@@ -93,6 +93,7 @@ import com.goafanti.common.enums.UserAbilityFields;
 import com.goafanti.common.enums.UserFields;
 import com.goafanti.common.enums.UserIdentityFields;
 import com.goafanti.common.enums.UserLevel;
+import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrgActivity;
 import com.goafanti.common.model.OrgActivityCost;
@@ -398,6 +399,11 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 			return res;
 		}
+		
+		if (UserType.ORGANIZATION.getCode().equals(inputUser.getType()) && StringUtils.isBlank(inputUser.getUnitName())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "公司名称", "公司名称"));
+			return res;
+		}
 
 		User u = new User();
 		u.setId(UUID.randomUUID().toString());
@@ -462,10 +468,10 @@ public class AdminApiController extends CertifyApiController {
 					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-
+        boolean insertFlag = Boolean.FALSE;
 		if (StringUtils.isBlank(userIdentity.getId())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户认证ID", "找不到用户认证ID"));
-			return res;
+			userIdentity.setId(UUID.randomUUID().toString());
+			insertFlag = Boolean.TRUE;
 		}
 
 		if (StringUtils.isBlank(userIdentity.getUid())) {
@@ -513,7 +519,7 @@ public class AdminApiController extends CertifyApiController {
 			ui.setProcess(IdentityProcess.COMMITTED.getCode());
 			ui.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
 		}
-		res.setData(userIdentityService.updateUserDetail(ui, saveSign, level));
+		res.setData(userIdentityService.updateUserDetail(ui, saveSign, level, insertFlag));
 		return res;
 	}
 

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

@@ -21,7 +21,7 @@ public interface UserIdentityService {
 
 	int saveUserIdentityProcess(Result res, UserIdentity u, String uid);
 
-	int updateUserDetail(UserIdentity userIdentity, String saveSign, Integer level);
+	int updateUserDetail(UserIdentity userIdentity, String saveSign, Integer level, Boolean insertFlag);
 
 	UserIdentity insertByAdmin(UserIdentity ui, String saveSign);
 

+ 23 - 10
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -19,6 +19,7 @@ import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.enums.CertifySubmitType;
 import com.goafanti.common.enums.IdentityAuditStatus;
+import com.goafanti.common.enums.IdentityProcess;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.UserLevel;
@@ -92,14 +93,26 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	}
 
 	@Override
-	public int updateUserDetail(UserIdentity u, String saveSign, Integer level) {
+	public int updateUserDetail(UserIdentity u, String saveSign, Integer level, Boolean insertFlag) {
 		User user = userMapper.selectByPrimaryKey(u.getUid());
-		user.setLvl(level);
-		userMapper.updateByPrimaryKey(user);
+		if (!UserLevel.GENERAL.getCode().equals(user.getLvl())
+				&& !CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
+			user.setLvl(level);
+			userMapper.updateByPrimaryKey(user);
+		}
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			createAuditorNotice(user);
 		}
-		return userIdentityMapper.updateByPrimaryKeySelective(u);
+		if (insertFlag) {
+			if (!CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
+				u.setProcess(IdentityProcess.UNCOMMITTED.getCode());
+				u.setAuditStatus(IdentityAuditStatus.UNCOMMITTED.getCode());
+			}
+			userIdentityMapper.insert(u);
+		} else {
+			userIdentityMapper.updateByPrimaryKeySelective(u);
+		}
+		return 1;
 
 	}
 
@@ -139,10 +152,10 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
-			Integer area, Integer pNo, Integer pSize) {
+	public Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province,
+			Integer city, Integer area, Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
-		
+
 		if (StringUtils.isNotBlank(name)) {
 			params.put("name", name);
 		}
@@ -158,15 +171,15 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		if (null != province) {
 			params.put("province", province);
 		}
-		
+
 		if (null != city) {
 			params.put("city", city);
 		}
-		
+
 		if (null != area) {
 			params.put("area", area);
 		}
-		
+
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}