1

kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java

@@ -50,6 +50,7 @@ public class DisasterInfoController {
 	private final DownloadRecordService downloadRecordService;
 
 	private final DisasterInfoVoService disasterInfoVoService;
+
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "分页", notes = "传入Tool")
 	@ApiImplicitParams({
@@ -61,8 +62,10 @@ public class DisasterInfoController {
 		IPage<CallForHelpVo> pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo);
 		return R.data(pages);
 	}
+
 	/**
 	 * 首页数据，轮播和定位相关
+	 *
 	 * @return
 	 */
 	@GetMapping("/indexData")
@@ -79,6 +82,7 @@ public class DisasterInfoController {
 
 	/**
 	 * 灾害查询条件，时间，类型，灾害联动
+	 *
 	 * @param disasterInfo
 	 * @return
 	 */
@@ -129,8 +133,6 @@ public class DisasterInfoController {
 	}
 
 
-
-
 	/**
 	 * 灾害信息统计 国家/灾害类型 左边栏
 	 *
@@ -293,6 +295,7 @@ public class DisasterInfoController {
 
 	/**
 	 * 获取用户所以得机构
+	 *
 	 * @return
 	 */
 	@GetMapping("/getUserTenant")
@@ -302,7 +305,6 @@ public class DisasterInfoController {
 
 	/**
 	 * call for help
-	 *
 	 */
 	@PostMapping("Call-for-help")
 	public R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) {
@@ -316,16 +318,15 @@ public class DisasterInfoController {
 		GuestManageDisasterRef GuestManageDisasterRef = new GuestManageDisasterRef();
 		GuestManageDisasterRef.setId(IdWorker.getId());
 		GuestManageDisasterRef.setSponsorId(guestInfo.getId());
-		String vordm_id="test";
 		GuestManageDisasterRef.setDisasterId(disasterInfo.getId());
 		Boolean flag1 = guestInfoService.save(guestInfo);
 		Boolean flag2 = guestManageDisasterRefService.save(GuestManageDisasterRef);
 		Boolean flag3 = disasterInfoService.save(disasterInfo);
-		Boolean callForHelp= flag1&flag2&flag3;
-//    callForHelpVo.setId(IdWorker.getId());
-//    Boolean insertFlag=accountInfoService.save(accountInfo);
+		Boolean callForHelp = flag1 && flag2 && flag3;
 		return R.data(callForHelp);
 	}
+
+
 	@PostMapping("review")
 	public R<Boolean> review(String id) {
 		DisasterInfo disasterInfo = new DisasterInfo();

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml

@@ -44,14 +44,13 @@
         gi.username AS sponsorName,
         gi.organization AS sponsorOrganization,
         bu.name AS managerName,
-        bt.tenant_name AS managerOrganization,
+        bu.organization AS managerOrganization,
         bdb.dict_value AS dictValue
         from disaster_info di
         left join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
         left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type
         left join guest_info gi on gi.id = gmdr.sponsor_id
         left join blade_user bu on bu.id = gmdr.manager_id
-        left join blade_tenant bt on bt.id = bu.organization
         <where>
             <if test="id != null and id != ''">
                 di.id = #{id}