Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3009,7 +3009,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			peopleInfoDto.getFirefighters().setSequenceNbr(orgUsrDto.getSequenceNbr().toString());
 		}
 
-		if (peopleInfoDto.getFirefighters() != null && "2".equals(peopleInfoDto.getFirefighters().getPeopleType())) {
+		if (peopleInfoDto.getFirefighters() != null && "1601".equals(peopleInfoDto.getFirefighters().getPeopleType())) {
 			// 3.同步保存cb_firefighters消防人员基础信息
 			saveFirefighters(peopleInfoDto);
 		} else {
@@ -3234,7 +3234,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			peopleBasicInfoDto.setCompanyName(orgUsr.getParentName());
 		}
 
-		if ("2".equals(peopleBasicInfoDto.getPeopleType())) {
+		if ("1601".equals(peopleBasicInfoDto.getPeopleType())) {
 			QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
 			Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", id).eq("is_delete", 0));
 			if (!ObjectUtils.isEmpty(firefighters)) {
@@ -3267,7 +3267,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Transactional(rollbackFor = Exception.class)
 	public String deletePeopleById(Long id, String type, AgencyUserModel user) {
 
-		if ("2".equals(type)) {
+		if ("1601".equals(type)) {
 			QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
 			Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", id).eq("is_delete", 0));
 			Long firefightersSequenceNbr = firefighters.getSequenceNbr();
@@ -3329,7 +3329,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		deleteFirefightersPost(String.valueOf(id));
 
 		// 3.根据type是否删除消防人员
-		if ("2".equals(type)) {
+		if ("1601".equals(type)) {
 			deleteFirefighters(id);
 		}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -437,7 +437,7 @@ public class FirefightersController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "获取人员详情", notes = "获取人员详情")
     public ResponseModel<PeopleInfoDto> updatePeopleById(@RequestBody PeopleInfoDto firefighters, @PathVariable Long id) {
         try {
-            if ("2".equals(firefighters.getFirefighters().getPeopleType())){
+            if ("1601".equals(firefighters.getFirefighters().getPeopleType())){
                 PeopleBasicInfoDto peopleBasicInfoDto = firefighters.getFirefighters();
                 Firefighters firefighter = new Firefighters();
                 BeanUtils.copyProperties(peopleBasicInfoDto, firefighter);