Commit 4b7a5874 authored by chenzhao's avatar chenzhao

xiugaibug

parent bcc4466e
...@@ -245,7 +245,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -245,7 +245,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
|| PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) { || PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName()); powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
powerStation.setDrawingReview("");
this.updateSeve(nodeCode, powerStation.getPeasantHouseholdId(), kv); this.updateSeve(nodeCode, powerStation.getPeasantHouseholdId(), kv);
} else { } else {
......
...@@ -2,12 +2,18 @@ package com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper; ...@@ -2,12 +2,18 @@ package com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.PrivilegeCompany; import com.yeejoin.amos.boot.module.jxiop.biz.entity.PrivilegeCompany;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
import java.util.Map;
public interface PrivilegeCompanyMapper extends BaseMapper<PrivilegeCompany> { public interface PrivilegeCompanyMapper extends BaseMapper<PrivilegeCompany> {
@Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,LEVEL as level from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0 ") @Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,LEVEL as level from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0 ")
public List<PrivilegeCompany> getAreaCompany(); public List<PrivilegeCompany> getAreaCompany();
@Select(" select LOGIN_ID from auth_login_info where LOGIN_ID = #{jobNum}")
List<Map<String, Object>> selectJobNumIsExist(@Param("jobNum")String jobNum);
} }
...@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper; ...@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService; import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
import com.yeejoin.amos.boot.module.jxiop.api.util.Constants; import com.yeejoin.amos.boot.module.jxiop.api.util.Constants;
import com.yeejoin.amos.boot.module.jxiop.biz.activemq.QuerueProduce; import com.yeejoin.amos.boot.module.jxiop.biz.activemq.QuerueProduce;
import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.PrivilegeCompanyMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.UserEmpowerMapper; import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.UserEmpowerMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.entity.StdUserEmpower; import com.yeejoin.amos.boot.module.jxiop.biz.entity.StdUserEmpower;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
...@@ -72,6 +73,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -72,6 +73,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
protected EmqKeeper emqKeeper; protected EmqKeeper emqKeeper;
@Autowired @Autowired
PersonBasicMapper personBasicMapper; PersonBasicMapper personBasicMapper;
@Autowired
PrivilegeCompanyMapper privilegeCompanyMapper;
// 人员账号信息service // 人员账号信息service
@Autowired @Autowired
PersonAccountServiceImpl personAccountService; PersonAccountServiceImpl personAccountService;
...@@ -173,7 +176,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -173,7 +176,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
PersonUser personUser = model.getPersonUser(); PersonUser personUser = model.getPersonUser();
// 获取人员账号信息 // 获取人员账号信息
PersonAccount personAccount = model.getPersonAccount(); PersonAccount personAccount = model.getPersonAccount();
List<Map<String, Object>> maps = personBasicMapper.selectJobNumIsExist(personAccount.getJobNumber()); List<Map<String, Object>> maps = privilegeCompanyMapper.selectJobNumIsExist(personAccount.getJobNumber());
if (CollectionUtils.isNotEmpty(maps) || maps.size()> 0){ if (CollectionUtils.isNotEmpty(maps) || maps.size()> 0){
throw new BadRequest("工号已存在"); throw new BadRequest("工号已存在");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment