修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -107,6 +107,9 @@ public interface IOrgUsrService {
      * @throws Exception
      */
     Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
+    Map<String, Object> selectForShowByIduser(OrgUsr orgUsr, Long id) throws Exception;
+
+
 
     List<OrgUsr> selectCompanyDepartmentMsg();
 
@@ -141,7 +144,7 @@ public interface IOrgUsrService {
     OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
 
     List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
-
+    List<Map<String, Object>> selectForShowByListIdUser(List<Long> ids) throws Exception;
     /**
      * * @param null
      *

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

@@ -611,6 +611,49 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return result;
 	}
 
+
+
+
+	@Override
+	public Map<String, Object> selectForShowByIduser(OrgUsr orgUsr, Long id) throws Exception {
+		QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<DynamicFormColumn>();
+		queryWrapper.eq("group_code", OrgPersonEnum.人员.getCode());
+		List<DynamicFormColumn> alertForms = alertFormServiceImpl.list(queryWrapper);
+		// 动态表单数据
+		List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
+		Map<String, Object> result = new HashMap<>();
+		result = Bean.BeantoMap(orgUsr);
+     	// 放入所有动态表单数据
+		for (DynamicFormColumn alertForm : alertForms) {
+			result.put(alertForm.getFieldCode(), null);
+		}
+
+		result.put("parenName", orgUsr.getParentId() != null?getByIduser(orgUsr.getParentId()).getBizOrgName():"");
+
+		for (DynamicFormInstanceDto alertFormValue : list) {
+			result.put(alertFormValue.getFieldCode(),
+					ObjectUtils.isEmpty(alertFormValue.getFieldValueLabel()) ? alertFormValue.getFieldValue()
+							: alertFormValue.getFieldValueLabel());
+		}
+		return result;
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	@Override
 	public List<OrgUsr> selectCompanyDepartmentMsg() {
 		List<OrgUsr> list = this.baseMapper.selectCompanyDepartmentMsg();
@@ -940,7 +983,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 		return personResult;
 	}
-
+	@Override
+	public List<Map<String, Object>> selectForShowByListIdUser(List<Long> ids) throws Exception {
+		List<Map<String, Object>> personResult = new ArrayList<>();
+		for (int i = 0; i < ids.size(); i++) {
+			OrgUsr orgUsr = getByIduser(ids.get(i));
+			Map<String, Object> result = selectForShowByIduser(orgUsr, ids.get(i));
+			personResult.add(result);
+		}
+		return personResult;
+	}
 	@Override
 	public List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData) {
 		if (null == pageNum || null == pageSize) {
@@ -1620,6 +1672,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUser;
 	}
 
+
+
+	public OrgUsr getByIduser(Serializable id) {
+		OrgUsr orgUser = this.baseMapper.selectById(id);
+		return orgUser;
+	}
+
 	public Object amosIdExist(String amosId) {
 		List<OrgUsr> orgUsrs = orgUsrMapper.amosIdExist(amosId);
 		if (orgUsrs.size() > 0) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -206,11 +206,11 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 alertSubmitted.setSchedulingTypeCode(alertSchedulingTypeEnum.get().getCode());
                 alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
                 alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo)));
-                String token = RequestContext.getToken();
-                ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(),
-                        ReginParams.class);
-                alertSubmitted.setRecUserName(reginParams.getUserModel().getUserName());
-                alertSubmitted.setSender(reginParams.getUserModel().getUserName());
+//                String token = RequestContext.getToken();
+//                ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(),
+//                        ReginParams.class);
+//                alertSubmitted.setRecUserName(reginParams.getUserModel().getUserName());
+//                alertSubmitted.setSender(reginParams.getUserModel().getUserName());
                 alertSubmitted.setUpdateTime(new Date());
                 alertSubmitted.setSubmissionTime(new Date());
 
@@ -222,7 +222,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 smsCode = alertBusinessTypeEnum.get().getSms_code();
             }
             // 组装人员信息
-            List<Map<String, Object>> orgUsers = orgUsrService.selectForShowByListId(ids);
+            List<Map<String, Object>> orgUsers = orgUsrService.selectForShowByListIdUser(ids);
 
             for (Map<String, Object> orgUser : orgUsers) {
                 AlertSubmittedObject alertSubmittedObject = new AlertSubmittedObject();