Merge branch 'chenhao' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersThoughtController.java

@@ -66,7 +66,9 @@ public class FirefightersThoughtController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "新增消防员思想谈话记录", notes = "新增消防员思想谈话记录")
     public ResponseModel<FirefightersThought> saveFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
     	iFirefightersThoughtService.save(firefightersThought);
-        if (!firefightersThought.getAttachments().isEmpty()){
+        /*bug 2883 消防人员，新增思想状态保存报错 2021-09-15 陈召 开始*/
+        if (firefightersThought.getAttachments() != null && !firefightersThought.getAttachments().isEmpty()){
+            /*bug 2883 消防人员，新增思想状态保存报错 2021-09-15 陈召 开始*/
             sourceFileService.saveAttachments(firefightersThought.getSequenceNbr(),firefightersThought.getAttachments());
         }
     	return ResponseHelper.buildResponse(firefightersThought);
@@ -104,7 +106,7 @@ public class FirefightersThoughtController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "修改消防员思想谈话记录", notes = "修改消防员思想谈话记录")
     public ResponseModel<FirefightersThought>  updateByIdFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
 
-        if (!firefightersThought.getAttachments().isEmpty()){
+        if (firefightersThought.getAttachments() != null && !firefightersThought.getAttachments().isEmpty()){
             sourceFileService.saveAttachments(firefightersThought.getSequenceNbr(),firefightersThought.getAttachments());
         }
     	iFirefightersThoughtService.updateById(firefightersThought);

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

@@ -551,11 +551,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }
         // 机场人员AMOS角色丢失修正, by litw end  2021年9月10日
         result = Bean.BeantoMap(orgUsr);
-         /*bug 2869 部门为空人员详情报空指针 2021-09-14 陈召 开始*/
-        if (getById(orgUsr.getParentId()) != null){
+         /*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 开始*/
+        if (orgUsr.getParentId()!= null){
             result.put("parenName", getById(orgUsr.getParentId()).getBizOrgName());
         }
-        /*bug 2869 部门为空人员详情报空指针 2021-09-14 陈召 结束*/
+        /*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 结束*/
         // 放入所有动态表单数据
         for (DynamicFormColumn alertForm : alertForms) {
             result.put(alertForm.getFieldCode(), null);
@@ -772,7 +772,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<FormValue> formValue = getFormValueDetail(id);
         OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue);
         BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
-        orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
+
+        /*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 开始*/
+        if (orgUsr.getParentId() != null){
+            orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
+        }
+        /*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 结束*/
+
         return orgPersonFormVo;
     }