1

src/main/java/com/sooka/sponest/mobile/comprehensive/ConflictDefuseController/AppConflictResolutionController.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.mobile.comprehensive.conflictDefuseController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
@@ -12,6 +13,7 @@ import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.service.R
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 
 @RestController
@@ -42,9 +44,9 @@ public class AppConflictResolutionController extends BaseController {
      */
     @GetMapping("/conflict/edit")
     public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = remoteConflictResolutionService.selectConflictResolutionById(id);
-        if("200".equals(String.valueOf(ajaxResult.get("code")))){
-            ConflictResolution conflictResolution = (ConflictResolution) ajaxResult.get("data");
+        R<ConflictResolution> edit = remoteConflictResolutionService.selectConflictResolutionById(id);
+        if(HttpStatus.SUCCESS == edit.getCode()){
+            ConflictResolution conflictResolution = edit.getData();
             conflictResolution.setMainPersonIdCodeLabel(DictUtils.getDictDataByValue("comprehensive_certificate_code", conflictResolution.getMainPersonIdCode()));
             conflictResolution.setMainPersonGenderLabel(DictUtils.getDictDataByValue("comprehensive_sex", conflictResolution.getMainPersonGender()));
             conflictResolution.setMainPersonNationalityLabel(DictUtils.getDictDataByValue("comprehensive_nation", conflictResolution.getMainPersonNationality()));
@@ -52,7 +54,7 @@ public class AppConflictResolutionController extends BaseController {
             conflictResolution.setResolutionSuccessLabel(!conflictResolution.getResolutionSuccess().isEmpty()?("1".equals(conflictResolution.getResolutionSuccess())?"是":"否"):"");
             return AjaxResult.success(conflictResolution);
         }else{
-            return AjaxResult.error(ajaxResult.get("code").toString(), ajaxResult.get("msg"));
+            return AjaxResult.error(edit.getCode(), edit.getMsg());
         }
     }
 

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/APPComprehensiveTPreventionOrganizationController.java

@@ -46,9 +46,8 @@ public class APPComprehensiveTPreventionOrganizationController {
     /**
      * 获取群防群治组织详细信息
      */
-    @GetMapping(value = "/preventionOrganization/{id}")
+    @GetMapping(value = "/preventionOrganization/edit")
     public AjaxResult getInfo(String id) {
-
         R<ComprehensiveTPreventionOrganization> edit =comprehensiveTPreventionOrganizationService.getInfo(id);
         ComprehensiveTPreventionOrganization data = edit.getData();
         if (HttpStatus.SUCCESS == edit.getCode()){

src/main/java/com/sooka/sponest/mobile/comprehensive/personBasicInfoController/AppPersonBasicInfoController.java

@@ -51,7 +51,7 @@ public class AppPersonBasicInfoController {
         AjaxResult ajaxResult = personBasicInfoService.getEdit(biggas.getId());
         if ("200".equals(ajaxResult.get("code").toString())) {
             Map<String, Object> data = (Map<String, Object>) ajaxResult.get("data");
-            HashMap<String, Object> basicInfo = (HashMap<String, Object>) data.get("basecInfo");
+            HashMap<String, Object> basicInfo = (HashMap<String, Object>) data.get("basicInfo");
             setPersonBasicInfo(basicInfo);
             List<HashMap<String, Object>> userBinds = (List<HashMap<String, Object>>) basicInfo.get("userBinds");
             ArrayList<HashMap<String, Object>> otherInfo = (ArrayList<HashMap<String, Object>>) data.get("otherInfo");