任务 9019

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -692,7 +692,7 @@ GROUP BY
     max(case field_code when 'nation' then field_value end)                     nation,
     max(case field_code when 'birthdayTime' then field_value end)                     birthdayTime,
     max(case field_code when 'maritalStatus' then field_value end)                     maritalStatus,
-    max(case field_code when 'nativePlace' then field_value_lable end)                     nativePlace,
+    max(case field_code when 'nativePlace' then field_value_label end)                     nativePlace,
     max(case field_code when 'nativePlaceVal' then field_value end)                     nativePlaceVal,
     max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
     max(case field_code when 'residenceDetails' then field_value_label end)                     residenceDetails,

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

@@ -17,6 +17,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -228,9 +229,16 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     @Transactional(rollbackFor = Exception.class)
 	public PeopleInfoDto updatePeopleById(PeopleInfoDto peopleInfoDto, Long id) {
 		// 1.动态表单
-		AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(peopleInfoDto.getFirefighters().getAmosUserId()).getResult();
-		peopleInfoDto.getFirefighters().setAmosName(amosUser.getRealName());
+
+		if(!ValidationUtil.isEmpty(peopleInfoDto.getFirefighters().getAmosUserId())) {
+			AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(peopleInfoDto.getFirefighters().getAmosUserId()).getResult();
+			peopleInfoDto.getFirefighters().setAmosName(amosUser.getRealName());
+		} else {
+			peopleInfoDto.getFirefighters().setAmosUserId(null);
+			peopleInfoDto.getFirefighters().setAmosName(null);
+		}
 		OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
+
 		OrgPersonDto orgPersonDto = new OrgPersonDto();
 		BeanUtils.copyProperties(orgUsr, orgPersonDto);
 		List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto.getFirefighters(), false);

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

@@ -445,10 +445,13 @@ public class FirefightersController extends BaseController {
                 if (!ObjectUtils.isEmpty(fire)) {
                     //判断此消防人员所属队伍是否变换，
                     //获取用户已绑定车辆id、
-                    UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(firefighters.getFirefighters().getAmosUserId()));
-                    if(userCar!=null&&!userCar.getTeamId().equals(firefighters.getFirefighters().getFireTeamId()+"")){
-                        userCarService.delete(userCar);
+                    if(!ValidationUtil.isEmpty(firefighters.getFirefighters().getAmosUserId())) {
+                        UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(firefighters.getFirefighters().getAmosUserId()));
+                        if(userCar!=null&&!userCar.getTeamId().equals(firefighters.getFirefighters().getFireTeamId()+"")){
+                            userCarService.delete(userCar);
+                        }
                     }
+
                     firefighter.setSequenceNbr(fire.getSequenceNbr());
                     firefighter.setOrgUsrId(peopleBasicInfoDto.getSequenceNbr());
                     firefighter.setEmployeeNumber(peopleBasicInfoDto.getPersonNumber());
@@ -525,7 +528,7 @@ public class FirefightersController extends BaseController {
                     map.put("jobTitle", e.getJobTitle());
                     map.put("bizOrgName", e.getBizOrgName());
                     map.put("bizOrgCode", e.getBizOrgCode());
-                    map.put("amosUserId", e.getAmosUserId());
+                    map.put("amosUserId", e.getOrgUsrId());
                     map.put("personnelPhotos", e.getPersonnelPhotos());
                     list.add(map);
                 });

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

@@ -99,7 +99,7 @@ public class SignController extends BaseController {
 	public ResponseModel<SignDto> selectOne(@PathVariable Long sequenceNbr) {
 		SignDto signDto = signServiceImpl.queryBySeq(sequenceNbr);
 		QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("amos_org_id",signDto.getSignUserId());
+		queryWrapper.eq("sequence_nbr",signDto.getSignUserId());
 		queryWrapper.eq("is_delete",0);
 		OrgUsr orgUsr = iOrgUsrService.getOne(queryWrapper);
 		try {