/gov/org/staff/addstaffv2兼容运营端调用

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java

@@ -74,5 +74,8 @@ public class AddStaffV2FromDTO implements Serializable {
 
 	private List<String> newRoles;
 
-	private String currentStaffId;
+	/**
+	 * 烟台用：当前登录用户
+	 */
+	private String currentUserId;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -4,13 +4,17 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.StaffService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -204,10 +208,20 @@ public class StaffController {
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_CREATE)
 	public Result<StaffDetailResultDTO> addStaffV2(@LoginUser TokenDto tokenDto, @RequestBody AddStaffV2FromDTO fromDTO){
 		ValidatorUtils.validateEntity(fromDTO, AddStaffV2FromDTO.AddStaff.class);
-		fromDTO.setCustomerId(tokenDto.getCustomerId());
-		fromDTO.setApp(tokenDto.getApp());
-		fromDTO.setClient(tokenDto.getClient());
-		fromDTO.setCurrentStaffId(tokenDto.getUserId());
+		if(AppClientConstant.APP_OPER.equals(tokenDto.getApp())){
+			if(StringUtils.isBlank(fromDTO.getCustomerId())){
+				// 该接口烟台运营端-统一认证也在用，所以客户id，运营端必传。
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"运营端操作，customerId不能为空","运营端操作，customerId不能为空");
+			}
+		}else{
+			//小程序端或者数字社区从token里面取
+			fromDTO.setCustomerId(tokenDto.getCustomerId());
+		}
+		//因为添加的是工作人员，这里写死吧！
+		fromDTO.setApp("gov");
+		fromDTO.setClient("wxmp");
+		//当前登录用户
+		fromDTO.setCurrentUserId(tokenDto.getUserId());
 		return staffService.addStaffV2(fromDTO);
 	}
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -575,8 +575,8 @@ public class StaffServiceImpl implements StaffService {
 		//1.根据新增人员类型判断查询机关信息
 		OrgResultDTO orgDTO = customerAgencyDao.selectAgencyDetail(fromDTO.getOrgId(), fromDTO.getOrgType());
 		if (null == orgDTO) {
-			logger.error(String.format("工作人员新增，根据新增人员组织类型未查询到相关组织信息,orgId->%s,orgType->%s", fromDTO.getOrgId(), fromDTO.getOrgType()));
-			throw new RenException("根据新增人员组织类型未查询到相关组织信息");
+			logger.warn(String.format("工作人员新增，根据新增人员组织类型未查询到相关组织信息,orgId->%s,orgType->%s", fromDTO.getOrgId(), fromDTO.getOrgType()));
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"根据新增人员组织类型未查询到相关组织信息","组织不存在");
 		}
 
 		//2.调用user服务，新增用户信息
@@ -655,7 +655,7 @@ public class StaffServiceImpl implements StaffService {
 				|| "0c41b272ee9ee95ac6f184ad548a30eb".equals(fromDTO.getCustomerId())) {
 			YtSyncStaffIdFormDTO ytSyncStaffIdFormDTO = ConvertUtils.sourceToTarget(fromDTO,YtSyncStaffIdFormDTO.class);
 			ytSyncStaffIdFormDTO.setStaffId(result.getData().getUserId());
-			ytSyncStaffIdFormDTO.setOperUserId(fromDTO.getCurrentStaffId());
+			ytSyncStaffIdFormDTO.setOperUserId(fromDTO.getCurrentUserId());
 			epmetThirdOpenFeignClient.dataSyncUpdateStaff(ytSyncStaffIdFormDTO);
 		}
 		//2022.10.18加个返参，借用下StaffDetailResultDTO不再新建dto了

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -349,7 +349,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         customerStaffFormDTO.setMobile(fromDTO.getMobile());
         CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfo(customerStaffFormDTO);
         if (null != customerStaffDTO) {
-            return new Result<CustomerStaffDTO>().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg());
+            // return new Result<CustomerStaffDTO>().error(EpmetErrorCode.MOBILE_USED.getCode(), EpmetErrorCode.MOBILE_USED.getMsg());
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"手机号已存在","手机号已存在");
         }
         //USER表插入数据
         UserEntity userEntity = new UserEntity();