修复bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormInitDto.java

@@ -40,6 +40,7 @@ public class DynamicFormInitDto implements Serializable{
     @ApiModelProperty(value = "接口地址")
     private String columnConfig;
     
+    private int sort;
     
 	public DynamicFormInitDto() {
 		

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormColumnMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
+
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface DynamicFormColumnMapper extends BaseMapper<DynamicFormColumn> {
 
+	List<DynamicFormInstanceDto> getDynamicFormInstanceList(String groupCode);
+
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -94,6 +95,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     					vo.setDefaultValue(date);
     				}
     				vo.setFormItemDescr(dynamicFormValue);
+    				vo.setSort(dynamicFormValue.getSort());
     				listfrom.add(vo);
     			} else {
     				// 查询数据项
@@ -119,6 +121,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				}
 
 	    				vo.setFormItemDescr(dynamicFormValue);
+	    				vo.setSort(dynamicFormValue.getSort());
 	    				listfrom.add(vo);
 						break;
 					case "action":
@@ -130,6 +133,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr());
 	    				dynamicFormValue.setAppKey(appKey);
 	    				vo.setFormItemDescr(dynamicFormValue);
+	    				vo.setSort(dynamicFormValue.getSort());
 	    				listfrom.add(vo);
 						break;
 					case "dict":
@@ -153,6 +157,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				}
 
 	    				vo.setFormItemDescr(dynamicFormValue);
+	    				vo.setSort(dynamicFormValue.getSort());
 	    				listfrom.add(vo);
 						break;
 					default:
@@ -162,14 +167,14 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    						dynamicForm.getFieldCode(), dynamicForm.getBlock(), dynamicForm.getGroupCode());
 	    				dynamicFormValue.setAppKey(appKey);
 	    				vo.setFormItemDescr(dynamicFormValue);
+	    				vo.setSort(dynamicFormValue.getSort());
 	    				listfrom.add(vo);
 						break;
 					}
-    				
     			}
     		});
 
-    		return listfrom;
+    		return listfrom.stream().sorted(Comparator.comparing(DynamicFormInitDto::getSort)).collect(Collectors.toList());
     	}
     	
     	public List<SelectItem> getdata(Collection<DataDictionary> list) {

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -27,7 +26,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormColumnDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
@@ -68,13 +66,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return this.baseMapper.selectUpUnitByParam(id);
 	}
 
-
 	public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
 
 		List<OrgMenuDto> menuList = list.stream().map(o -> {
 			OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
-                    ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(),
-                    false, o.getBizOrgCode());
+					ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,
+					o.getBizOrgCode());
 			return menu;
 		}).collect(Collectors.toList());
 
@@ -103,8 +100,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName,
-                                    int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName,
-                                    String OrgTypeMethodName) throws Exception {
+			int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName)
+			throws Exception {
 		List<OrgMenuDto> resultList = new ArrayList<>();
 		Class<?> clazz = Class.forName(packageURL);
 		Method IDMethodNameme = null;
@@ -126,14 +123,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Method NAMEMethodNameme = clazz.getDeclaredMethod(NAMEMethodName);
 		Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
 		Method OrgTypeMethodNameme = clazz.getDeclaredMethod(OrgTypeMethodName);
-        //获取顶层元素集合
+		// 获取顶层元素集合
 		Long parentId;
 		for (Object ob : entityList) {
 
 			Object entity = clazz.cast(ob);
 
-            parentId = PARENTIDMethodNameme.invoke(entity) != null ?
-                    Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null;
+			parentId = PARENTIDMethodNameme.invoke(entity) != null
+					? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)))
+					: null;
 
 			if (parentId == null || topId == parentId) {
 				OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
@@ -142,7 +140,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				resultList.add(menu);
 			}
 		}
-        //获取每个顶层元素的子数据集合
+		// 获取每个顶层元素的子数据集合
 		for (OrgMenuDto entity : resultList) {
 			entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy,
 					NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
@@ -152,8 +150,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@SuppressWarnings("unchecked")
 	@Override
-    public List<OrgMenuDto> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL
-            , String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName,
+	public List<OrgMenuDto> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL,
+			String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName,
 			String OrgTypeMethodName) throws Exception {
 		List<OrgMenuDto> childList = new ArrayList<>();
 		@SuppressWarnings("rawtypes")
@@ -178,12 +176,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
 
 		Long parentId;
-        //子集的直接子对象
+		// 子集的直接子对象
 		for (Object ob : entityList) {
 			Object entity = clazz.cast(ob);
 
-            parentId = PARENTIDMethodNameme.invoke(entity) != null ?
-                    Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null;
+			parentId = PARENTIDMethodNameme.invoke(entity) != null
+					? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)))
+					: null;
 
 			if (parentId == null) {
 				if (topId == parentId) {
@@ -203,7 +202,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		}
 
-        //子集的间接子对象
+		// 子集的间接子对象
 		for (OrgMenuDto entity : childList) {
 			entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy,
 					NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
@@ -212,7 +211,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			}
 		}
 
-        //递归退出条件
+		// 递归退出条件
 		if (childList.size() == 0) {
 			return null;
 		}
@@ -291,7 +290,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return ObjectUtils.isEmpty(obj) ? defaultValue : obj;
 	}
 
-
 	public List<Map<String, Object>> listPerson(String parentId) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
@@ -301,7 +299,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return list == null ? new ArrayList<Map<String, Object>>() : list;
 	}
 
-
 	public IPage<Map<String, Object>> pagePerson(String pageNum, String pageSize, Map<String, Object> req) {
 		IPage<Map<String, Object>> pageBean = null;
 		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
@@ -340,13 +337,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		for (DynamicFormInstanceDto alertFormValue : list) {
 			if (alertFormValue.getFieldValue() != null) {
 				FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                        alertFormValue.getFieldType(),
-                        alertFormValue.getFieldValue(), alertFormValue.getBlock());
+						alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
 				formValue.add(value);
 			} else {
 				FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                        alertFormValue.getFieldType(),
-                        alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
+						alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
 				formValue.add(value);
 			}
 		}
@@ -359,8 +354,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<FormValue> formValue = new ArrayList<>();
 		for (DynamicFormInstanceDto alertFormValue : list) {
 			FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                    alertFormValue.getFieldType(),
-                    alertFormValue.getFieldValue(), alertFormValue.getBlock());
+					alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
 			formValue.add(value);
 		}
 		return formValue;
@@ -400,7 +394,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		updateById(orgUsr);
 	}
 
-
 	private void updateChildOrgCode(String oriOrgCode, String targetOrgCode) {
 		List<OrgUsr> list = queryOrgUsrList(oriOrgCode);
 		if (ObjectUtils.isEmpty(list)) {
@@ -444,54 +437,47 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			alertFromValue.setInstanceId(orgUsr.getSequenceNbr());
 		});
 		List<DynamicFormInstanceDto> formList = alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr());
-        if (formList != null && formList.size() > 0) {
-            for (DynamicFormInstance dis : alertFromValuelist) {
-                for (DynamicFormInstanceDto src : formList) {
-                    if (dis.getFormColumnId() == src.getFormColumnId()) {
-                        dis.setSequenceNbr(src.getSequenceNbr());
-                        dis.setRecDate(new Date());
-                        dis.setRecUserId(orgUsr.getRecUserId());
-                        dis.setRecUserName(orgUsr.getRecUserName());
-                        dis.setFieldValue(src.getFieldValue());
-                        dis.setFieldValueLabel(src.getFieldValueLabel());
-                        dis.setSequenceNbr(src.getSequenceNbr());
-                        break;
-                    }
-                }
+
+		Map<Long, DynamicFormInstanceDto> resourceMap = new HashMap<>();
+		Map<Long, DynamicFormInstance> newResoourceMap = new HashMap<>();
+		formList.parallelStream().forEach(form -> {
+			resourceMap.put(form.getFormColumnId(), form);
+		});
+		
+		List<DynamicFormInstance> updateList = new ArrayList<>();
+		List<DynamicFormInstance> addList = new ArrayList<>();
+		List<Long> deleteList = new ArrayList<>();
+		
+		alertFromValuelist.parallelStream().forEach(submitFormItem -> {
+			if ( resourceMap.containsKey(submitFormItem.getFormColumnId())) {
+				DynamicFormInstanceDto oldForm = resourceMap.get(submitFormItem.getFormColumnId());
+				submitFormItem.setSequenceNbr(oldForm.getSequenceNbr());
+				updateList.add(submitFormItem);
+			}else {
+				addList.add(submitFormItem);
 			}
-            // 保存动态表单数据
-            alertFormValueServiceImpl.updateBatchById(alertFromValuelist);
+			newResoourceMap.put(submitFormItem.getFormColumnId(), submitFormItem);
+		});
 		
-            List<DynamicFormColumnDto> form = alertFormServiceImpl.queryListByTypeCode(formList.get(0).getGroupCode());
 
-            if (form.size() != alertFromValuelist.size()) {
+		newResoourceMap.keySet().parallelStream().forEach(form -> {
+			resourceMap.remove(form);
+		});
 		
-                List<DynamicFormInstance> creatList = new ArrayList<>();
+		resourceMap.keySet().parallelStream().forEach(action -> {
+			deleteList.add(resourceMap.get(action).getSequenceNbr());
+		});
 		
-                for (DynamicFormInstance dis : alertFromValuelist) {
-                    boolean exist = false;
-                    for (DynamicFormInstanceDto src : formList) {
-                        if (dis.getFormColumnId() == src.getSequenceNbr()) {
-                            exist = true;
-                            break;
-                        }
-                    }
-                    if (ObjectUtils.isEmpty(dis) && !exist) {
-                        creatList.add(dis);
-                    }
+		if (deleteList.size() > 0) {
+			alertFormValueServiceImpl.deleteBatchSeq(deleteList);
 		}
 		
-                alertFormValueServiceImpl.saveBatch(creatList);
+		if (updateList.size() > 0) {
+			alertFormValueServiceImpl.updateBatchById(updateList);
 		}
 		
-            List<DynamicFormInstance> creatList =
-                    alertFromValuelist.stream().filter(v -> v.getSequenceNbr() == null || v.getSequenceNbr() == 0).collect(Collectors.toList());
-            if (creatList != null && creatList.size() > 0) {
-                alertFormValueServiceImpl.saveBatch(creatList);
-            }
-        } else {
-            // 保存动态表单数据
-            alertFormValueServiceImpl.saveBatch(alertFromValuelist);
+		if (addList.size() > 0) {
+			alertFormValueServiceImpl.saveBatch(addList);
 		}
 	}
 
@@ -510,7 +496,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			result.put(alertForm.getFieldCode(), null);
 		}
 		for (DynamicFormInstanceDto alertFormValue : list) {
-            result.put(alertFormValue.getFieldCode(), ObjectUtils.isEmpty(alertFormValue.getFieldValueLabel()) ? alertFormValue.getFieldValue() : alertFormValue.getFieldValueLabel());
+			result.put(alertFormValue.getFieldCode(),
+					ObjectUtils.isEmpty(alertFormValue.getFieldValueLabel()) ? alertFormValue.getFieldValue()
+							: alertFormValue.getFieldValueLabel());
 		}
 		return result;
 	}
@@ -555,7 +543,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
 
-
 		if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
 			AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
 			OrgPersonVo.setAmosOrgCode(user.getRealName());
@@ -680,7 +667,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgPersonFormVo;
 	}
 
-
 	@Override
 	public List<OrgMenuDto> selectPersonTree() throws Exception {
 		Map<String, Object> columnMap = new HashMap<>();
@@ -691,7 +677,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				"getBizOrgType");
 	}
 
-
 	@Override
 	public void savePersonList(List<OrgPersonDto> OrgPersonVo) throws Exception {
 		for (int i = 0; i < OrgPersonVo.size(); i++) {
@@ -776,46 +761,46 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgPersonDto = Bean.toPo(item, orgPersonDto);
 			List<DynamicFormInstance> alertFormValueList = new ArrayList<>();
 			if (item.getPersonNumber() != null) {
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(102L, OrgPersonEnum.人员.getCode(), "员工编号", "personNumber",
-                                item.getPersonNumber(), null, false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(102L, OrgPersonEnum.人员.getCode(), "员工编号",
+						"personNumber", item.getPersonNumber(), null, false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getCertificatesType() != null) {
 				String certificatesType = item.getCertificatesType();
 				String[] split = certificatesType.split("@");
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(23L, OrgPersonEnum.人员.getCode(), "证件类型", "certificatesTypeCode"
-                                , split[0], split[1], false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(23L, OrgPersonEnum.人员.getCode(), "证件类型",
+						"certificatesTypeCode", split[0], split[1], false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getGender() != null) {
 				String gender = item.getGender();
 				String[] split = gender.split("@");
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(22L, OrgPersonEnum.人员.getCode(), "性别", "gender", split[0],
-                                split[1], false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(22L, OrgPersonEnum.人员.getCode(), "性别",
+						"gender", split[0], split[1], false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getCertificatesNumber() != null) {
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(100L, OrgPersonEnum.人员.getCode(), "证件号码", "certificatesNumber",
-                                item.getCertificatesNumber(), null, false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(100L, OrgPersonEnum.人员.getCode(), "证件号码",
+						"certificatesNumber", item.getCertificatesNumber(), null, false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getTelephone() != null) {
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(24L, OrgPersonEnum.人员.getCode(), "联系电话", "telephone",
-                                item.getTelephone(), null, false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(24L, OrgPersonEnum.人员.getCode(), "联系电话",
+						"telephone", item.getTelephone(), null, false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getState() != null) {
 				String state = item.getState();
 				String[] split = state.split("@");
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(25L, OrgPersonEnum.人员.getCode(), "人员状态", "stateCode", split[0],
-                                split[1], false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(25L, OrgPersonEnum.人员.getCode(), "人员状态",
+						"stateCode", split[0], split[1], false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getSafetyTraining() != null) {
 				String safetyTraining = item.getSafetyTraining();
 				String[] split = safetyTraining.split("@");
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(29L, OrgPersonEnum.人员.getCode(), "是否进行安全培训", "safetyTraining",
-                                split[0], split[1], false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(29L, OrgPersonEnum.人员.getCode(),
+						"是否进行安全培训", "safetyTraining", split[0], split[1], false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getAdministrativePosition() != null) {
@@ -828,8 +813,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			if (item.getInternalPosition() != null) {
 				String internalPosition = item.getInternalPosition();
 				String[] split = internalPosition.split("@");
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(26L, OrgPersonEnum.人员.getCode(), "消防管理组织机构内部职务",
-                                "internalPositionCode", split[0], split[1], false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(26L, OrgPersonEnum.人员.getCode(),
+						"消防管理组织机构内部职务", "internalPositionCode", split[0], split[1], false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getFireManagementPost() != null) {
@@ -842,37 +827,38 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			if (item.getPositionType() != null) {
 				String positionType = item.getPositionType();
 				String[] split = positionType.split("@");
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(30L, OrgPersonEnum.人员.getCode(), "岗位类型", "positionType",
-                                split[0], split[1], false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(30L, OrgPersonEnum.人员.getCode(), "岗位类型",
+						"positionType", split[0], split[1], false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getCertificateType() != null) {
 				String certificateType = item.getCertificateType();
 				String[] split = certificateType.split("@");
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(31L, OrgPersonEnum.人员.getCode(), "持证类别", "certificateType",
-                                split[0], split[1], false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(31L, OrgPersonEnum.人员.getCode(), "持证类别",
+						"certificateType", split[0], split[1], false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getHoldingTime() != null) {
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(32L, OrgPersonEnum.人员.getCode(), "持证时间", "holdingTime",
-                                new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(item.getHoldingTime()), null, false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(32L, OrgPersonEnum.人员.getCode(), "持证时间",
+						"holdingTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(item.getHoldingTime()), null,
+						false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getAuditCycle() != null) {
 				String auditCycle = item.getAuditCycle();
 				String[] split = auditCycle.split("@");
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(33L, OrgPersonEnum.人员.getCode(), "审核周期", "auditCycle",
-                                split[0], split[1], false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(33L, OrgPersonEnum.人员.getCode(), "审核周期",
+						"auditCycle", split[0], split[1], false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getPersonImg() != null) {
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(34L, OrgPersonEnum.人员.getCode(), "人员照片", "personImg",
-                                item.getPersonImg(), null, false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(34L, OrgPersonEnum.人员.getCode(), "人员照片",
+						"personImg", item.getPersonImg(), null, false);
 				alertFormValueList.add(alertFormValue);
 			}
 			if (item.getCertificateImg() != null) {
-                        DynamicFormInstance alertFormValue = new DynamicFormInstance(101L, OrgPersonEnum.人员.getCode(), "重点工种资质证书", "certificateImg",
-                                item.getCertificateImg(), null, false);
+				DynamicFormInstance alertFormValue = new DynamicFormInstance(101L, OrgPersonEnum.人员.getCode(),
+						"重点工种资质证书", "certificateImg", item.getCertificateImg(), null, false);
 				alertFormValueList.add(alertFormValue);
 			}
 			try {
@@ -881,8 +867,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-                }
-        );
+		});
 	}
 
 	public List<OrgPersonExcelDto> queryOrgPersonDtoList(boolean isDelete) {