企业端管理员变更报错提示修改

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -13,7 +13,6 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
-import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ObjectUtils;
@@ -192,8 +191,17 @@ public class TzBaseEnterpriseInfoController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/adminInfoUpdate", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "修改企业信息", notes = "修改企业信息")
-	public ResponseModel<RegUnitInfo> adminInfoUpdate(@RequestBody Map<String,Object> map) {
-		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.adminInfoUpdate(map));
+	public ResponseModel<Object> adminInfoUpdate(@RequestBody Map<String,Object> map) {
+		ResponseModel responseModel = new ResponseModel();
+		Map<String, Object> result = iTzBaseEnterpriseInfoService.adminInfoUpdate(map);
+		if (result.containsKey("fail")) {
+			ResponseModel response = new ResponseModel();
+			response.setStatus(500);
+			response.setDevMessage(result.get("fail").toString());
+			return ResponseHelper.buildResponse(responseModel);
+		} else {
+			return ResponseHelper.buildResponse(result.get("success"));
+		}
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -42,7 +42,6 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.text.ParseException;
 import java.util.*;
@@ -441,7 +440,7 @@ public class TzBaseEnterpriseInfoServiceImpl
     }
 
 
-	public RegUnitInfo adminInfoUpdate(Map<String, Object> map) {
+	public Map<String,Object> adminInfoUpdate(Map<String, Object> map) {
 		//每一个企业只有一个管理员，所以当前登录用户即管理员用户
 		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
 		RequestContext.setAppKey(appkey);
@@ -451,31 +450,31 @@ public class TzBaseEnterpriseInfoServiceImpl
 			loginCtiUser();
 		}
 		RequestContext.setToken(String.valueOf(redisUtil.get(TZS_USER_TOKEN)));
-		if (me.getMobile().equals(String.valueOf(map.get("adminTel")))) {
-			RegUnitInfo regUnitInfo = new RegUnitInfo();
-			String useCode = String.valueOf(map.get("useCode"));
-			regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
-			regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
-			regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
-			regUnitInfo.setAdminTel(ObjectUtils.isEmpty(map.get("adminNewTel")) ? me.getMobile() : String.valueOf(map.get("adminNewTel")));
-			boolean b;
-			if (ObjectUtils.isEmpty(me)) {
-				throw new BadRequest("平台用户不存在");
-			} else {
+		Map<String,Object> resultMap = new HashMap<>();
+		if (!ObjectUtils.isEmpty(me)) {
+			if (String.valueOf(map.get("adminTel")).equals(me.getMobile())) {
+				RegUnitInfo regUnitInfo = new RegUnitInfo();
+				String useCode = String.valueOf(map.get("useCode"));
+				regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
+				regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
+				regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
+				regUnitInfo.setAdminTel(ObjectUtils.isEmpty(map.get("adminNewTel")) ? me.getMobile() : String.valueOf(map.get("adminNewTel")));
 				me.setMobile(ObjectUtils.isEmpty(map.get("adminNewTel")) ? me.getMobile() : String.valueOf(map.get("adminNewTel")));
 				me.setRealName(String.valueOf(map.get("adminName")));
 				FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
-				b = 200 == updateResult.getStatus();
-				if (b) {
-					b = regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", useCode));
+				if (200 == updateResult.getStatus()) {
+					regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", useCode));
+					resultMap.put("success", regUnitInfo);
 				} else {
-					throw new BadRequest("平台用户修改失败，请联系管理员");
+					resultMap.put("fail", "平台用户修改失败，请联系管理员");
 				}
+			} else {
+				resultMap.put("fail", "请输入正确的原始手机号！");
 			}
-			return b ? regUnitInfo : null;
 		} else {
-			throw new BadRequest("请输入正确的原始手机号！");
+			resultMap.put("fail", "平台用户不存在");
 		}
+		return resultMap;
 	}
 
 	//机器人用户登录