Antiloveg 8 years ago
parent
commit
f4a462942f

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

@@ -497,7 +497,7 @@ public class AdminApiController extends CertifyApiController {
 			ui.setProcess(IdentityProcess.COMMITTED.getCode());
 			ui.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
 		}
-		res.setData(userIdentityService.updateUserDetail(ui, saveSign));
+		res.setData(userIdentityService.updateUserDetail(ui, saveSign, userIdentity.getLevel()));
 		return res;
 	}
 
@@ -564,6 +564,8 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
 			return res;
 		}
+		
+		//if (null == )
 
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
@@ -575,7 +577,7 @@ public class AdminApiController extends CertifyApiController {
 		OrganizationIdentity oi = new OrganizationIdentity();
 		BeanUtils.copyProperties(orgIdentity, oi);
 
-		res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign));
+		res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign, orgIdentity.getLevel()));
 		return res;
 	}
 

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

@@ -30,7 +30,7 @@ public interface OrganizationIdentityService {
 
 	int saveOrgIndentityProcess(Result res, OrganizationIdentity o, String uid);
 
-	int updateOrgDetail(OrganizationIdentity orgIdentity, String saveSign);
+	int updateOrgDetail(OrganizationIdentity orgIdentity, String saveSign, Integer level);
 
 	OrgBasicInfoBo selectBasicInfo(String uid, int year);
 

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

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

+ 4 - 3
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -141,7 +141,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	}
 
 	@Override
-	public int updateOrgDetail(OrganizationIdentity orgIdentity, String saveSign) {
+	public int updateOrgDetail(OrganizationIdentity orgIdentity, String saveSign, Integer level) {
 		if (null != orgIdentity.getLastYearTaxReportUrl()) {
 			Calendar cal = Calendar.getInstance();
 			OrgRatepay rate = orgRatepayMapper.selectRatepayByUidAndYear(orgIdentity.getUid(), Calendar.YEAR - 1);
@@ -158,9 +158,10 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 				orgRatepayMapper.updateByPrimaryKeySelective(rate);
 			}
 		}
-
+		User user = userMapper.selectByPrimaryKey(orgIdentity.getUid());
+		user.setLvl(level);
+		userMapper.updateByPrimaryKeySelective(user);
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
-			User user = userMapper.selectByPrimaryKey(orgIdentity.getUid());
 			createAuditorNotice(user);
 		} 
 		return organizationIdentityMapper.updateByPrimaryKeySelective(orgIdentity);

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

@@ -87,9 +87,11 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 	}
 
 	@Override
-	public int updateUserDetail(UserIdentity u, String saveSign) {
+	public int updateUserDetail(UserIdentity u, String saveSign, Integer level) {
+		User user = userMapper.selectByPrimaryKey(u.getUid());
+		user.setLvl(level);
+		userMapper.updateByPrimaryKey(user);
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
-			User user = userMapper.selectByPrimaryKey(u.getUid());
 			createAuditorNotice(user);
 		}
 		return userIdentityMapper.updateByPrimaryKeySelective(u);