Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer

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

@@ -115,13 +115,14 @@ public class FirefightersController extends BaseController {
     @Transactional
     public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id){
     	
-    	try {
+    	
     		QueryWrapper<FirefightersJacket> queryWrapper = new QueryWrapper<>();
     		queryWrapper.eq("firefighters_id", id);
-    		FirefightersJacket firefightersJacket = iFirefightersJacketService.getOne(queryWrapper);
+    		List<FirefightersJacket> firefightersJacket = iFirefightersJacketService.list(queryWrapper);
         	if(firefightersJacket!=null) {
         		throw new RuntimeException("该消防还有在装装备！");  	
-        	}       	       	
+        	} 
+        	try {
         	iFirefightersService.update(new UpdateWrapper<Firefighters>().eq("sequence_nbr", id).set("is_delete", 1));     	
         	iFirefightersPostService.update(new UpdateWrapper<FirefightersPost>().eq("firefighters_id", id).set("is_delete", 1));
         	ifirefightersContactsService.update(new UpdateWrapper<FirefightersContacts>().eq("firefighters_id", id).set("is_delete", 1));

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

@@ -57,7 +57,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 		try {
    	    // 警情基本信息
          AlertCalled alertCalled = alertCalledVo.getAlertCalled();
-			alertCalled.setCallTime(new Date());
+         alertCalled.setCallTime(new Date());
          // 判断是否归并警情
          if (alertCalled.getFatherAlert() != null) {
              // 警情归并，设置当前警情状态为结束。