新增用户接口修改

ibps-api-root/modules/api-base/src/main/java/com/lc/ibps/api/base/constants/StateEnum.java

@@ -85,6 +85,7 @@ public enum StateEnum /*implements BaseEnum*/ {
 	, ILLEGAL_ORG_UNKOWN(6020113, "未知部门")
 	, ILLEGAL_POSITION_UNKOWN(6020114, "未知岗位")
 	, ILLEGAL_ACCOUNT_PASSWORD_REQUEST_VALIDCODE(6020115, "用户名或密码错误多次需要输入验证码")
+	, ACCOUNT_IS_EXIST(602117, "账号已存在！！！")
 	
 	, ILLEGAL_WECHAT_ERROT(6020116, "微信接口请求错误")
 	

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/org/provider/PartyEmployeeProvider.java

@@ -10,6 +10,7 @@ import java.util.Map.Entry;
 import javax.annotation.Resource;
 
 import com.lc.ibps.org.party.persistence.entity.*;
+import org.apache.bcel.generic.I2F;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.event.Level;
 import org.springframework.stereotype.Service;
@@ -934,11 +935,8 @@ public class PartyEmployeeProvider extends GenericProvider implements IPartyEmpl
 	}
 	
 	private APIResult<Void> save( PartyEmployeeVo partyEmployeeVo) {
+		// 离大谱逻辑修改
 		APIResult<Void> result = new APIResult<Void>();
-		PartyEmployeePo partyEmployeePo = partyEmployeeVo.getPartyEmployeePo();
-		if(BeanUtils.isEmpty(partyEmployeeVo.getPositionVoList())){
-			partyEmployeePo.setPositions(null);
-		}
 		try {
 			logger.debug(
 					"com.lc.ibps.org.provider.PartyEmployeeProvider.save()--->partyEmployeePo :{} ,partyUserPo :{} ,"
@@ -946,26 +944,56 @@ public class PartyEmployeeProvider extends GenericProvider implements IPartyEmpl
 					partyEmployeeVo.getPartyEmployeePo().toString(), partyEmployeeVo.getUser().toString(),
 					partyEmployeeVo.getAttrValueVoList().toString(), partyEmployeeVo.getPositionVoList().toString(),
 					partyEmployeeVo.getRoleVoList().toString(), partyEmployeeVo.getUserGroupPoList().toString());
-			String id = partyEmployeePo.getId();
-			// 获取当前树节点的id作为下个节点的父节点
-			if (StringUtil.isEmpty(partyEmployeePo.getParentId())) {
-				partyEmployeePo.setParentId("0");
-			}
-			PartyEmployee partyEmployee = partyEmployeeRepository.newInstance(partyEmployeePo);
-			PartyEmlpoyeeValidator.checkNullAndIllegal(partyEmployeePo);
-			if (StringUtil.isEmpty(id)) {
+
+			PartyUserPo userPo = partyUserRepository.getByAccount(partyEmployeeVo.getPartyEmployeePo().getAccount());
+			if (userPo != null){
+				result.setState(StateEnum.ACCOUNT_IS_EXIST.getCode());
+				result.setMessage("账号已存在！！！");
+			}else {
+				PartyEmployeePo partyEmployeePo = partyEmployeeVo.getPartyEmployeePo();
+				PartyEmployee partyEmployee = partyEmployeeRepository.newInstance(partyEmployeePo);
+				PartyEmlpoyeeValidator.checkNullAndIllegal(partyEmployeePo);
 				partyEmployee.createByCascade(partyEmployeeVo);
 				result.setMessage(I18nUtil.getMessage("com.lc.ibps.org.provider.PartyEmployeeProvider.save.create"));
 				result.addVariable("id", partyEmployeePo.getId());
-			} else {
-				partyEmployee.updateByCascade(partyEmployeeVo);
-				result.setMessage(I18nUtil.getMessage("com.lc.ibps.org.provider.PartyEmployeeProvider.save.update"));
-				result.addVariable("id", partyEmployeePo.getId());
 			}
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR_EMPLOYEE.getCode(), I18nUtil.getMessage(StateEnum.ERROR_EMPLOYEE.getCode()+""), e);
 		}
+
 		return result;
+//		APIResult<Void> result = new APIResult<Void>();
+//		PartyEmployeePo partyEmployeePo = partyEmployeeVo.getPartyEmployeePo();
+//		if(BeanUtils.isEmpty(partyEmployeeVo.getPositionVoList())){
+//			partyEmployeePo.setPositions(null);
+//		}
+//		try {
+//			logger.debug(
+//					"com.lc.ibps.org.provider.PartyEmployeeProvider.save()--->partyEmployeePo :{} ,partyUserPo :{} ,"
+//							+ "attrValueVoList :{} ,positionVoList :{} ,roleVoList :{} ,userGroupPoList :{} ,",
+//					partyEmployeeVo.getPartyEmployeePo().toString(), partyEmployeeVo.getUser().toString(),
+//					partyEmployeeVo.getAttrValueVoList().toString(), partyEmployeeVo.getPositionVoList().toString(),
+//					partyEmployeeVo.getRoleVoList().toString(), partyEmployeeVo.getUserGroupPoList().toString());
+//			String id = partyEmployeePo.getId();
+//			// 获取当前树节点的id作为下个节点的父节点
+//			if (StringUtil.isEmpty(partyEmployeePo.getParentId())) {
+//				partyEmployeePo.setParentId("0");
+//			}
+//			PartyEmployee partyEmployee = partyEmployeeRepository.newInstance(partyEmployeePo);
+//			PartyEmlpoyeeValidator.checkNullAndIllegal(partyEmployeePo);
+//			if (StringUtil.isEmpty(id)) {
+//				partyEmployee.createByCascade(partyEmployeeVo);
+//				result.setMessage(I18nUtil.getMessage("com.lc.ibps.org.provider.PartyEmployeeProvider.save.create"));
+//				result.addVariable("id", partyEmployeePo.getId());
+//			} else {
+//				partyEmployee.updateByCascade(partyEmployeeVo);
+//				result.setMessage(I18nUtil.getMessage("com.lc.ibps.org.provider.PartyEmployeeProvider.save.update"));
+//				result.addVariable("id", partyEmployeePo.getId());
+//			}
+//		} catch (Exception e) {
+//			setExceptionResult(result, StateEnum.ERROR_EMPLOYEE.getCode(), I18nUtil.getMessage(StateEnum.ERROR_EMPLOYEE.getCode()+""), e);
+//		}
+//		return result;
 	}
 	
 	@ApiOperation(value = "是否主岗位或主负责人", notes = "是否主岗位或主负责人")