3963 bug 3532 3858

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

@@ -409,7 +409,7 @@ FROM
 						FROM
 							cb_org_usr
 						WHERE
-							biz_org_name = #{departmentName}
+							biz_org_name = #{departmentName} and is_delete = 0
 						
 					)
 				AND cou.biz_org_type = 'PERSON'

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

@@ -98,19 +98,19 @@ public class VoiceRecordFileController extends BaseController {
 		page.setSize(pageSize);
 		String sortParam = "";
 		String sortRule = "";
-//		if(sort!=null) {  // 排序失效
-//			String[] date=  sort.split(",");
-//			if(date[1].equals("ascend")) {
-//				sortParam = RedisKey.humpToLine(date[0]);
-//				sortRule = "asc";
-//			}else {
-//				sortParam =RedisKey.humpToLine(date[0]);
-//				sortRule = "desc";
-//			}
-//		}else {
-//			sortParam = "tel_start_time";
-//			sortRule = "desc";
-//		}
+		if(sort!=null) {  // 排序失效
+			String[] date=  sort.split(",");
+			if(date[1].equals("ascend")) {
+				sortParam = RedisKey.humpToLine(date[0]);
+				sortRule = "asc";
+			}else {
+				sortParam =RedisKey.humpToLine(date[0]);
+				sortRule = "desc";
+			}
+		}else {
+			sortParam = "tel_start_time";
+			sortRule = "desc";
+		}
 		Page<VoiceRecordFileDto> pageBean = voiceRecordFileService.queryRecordListByQueryDto(page,
 				model.getTelStartTimeStr(),model.getTelEndTimeStr(),model.getFileType(),model.getCaller(),
 				model.getCalled(),sortParam,sortRule);

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

@@ -599,7 +599,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			/*
 			 * if(null == valueCode) { valueCode = alertFormValue.getFieldValue(); }
 			 */
-			listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+			if("flightNumber".equals(alertFormValue.getFieldCode()) || "aircraftModel".equals(alertFormValue.getFieldCode())) {
+				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
+			} else  {
+				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+			}
 		});
 		map.put("data", listdate);