修复bug，其他人员类型查询详情时，关联表为增加数据状态校验。导致查询数据大于1报错

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

@@ -30,7 +30,7 @@ public class AppPersonBasicInfoController {
     private RemotePersonBasicInfoService personBasicInfoService;
 
     /**
-     * 查询大气监测点/水质监测点/污染源监测点管理列表
+     * 查询人员信息列表
      */
     @GetMapping("/PersonBasicInfo/list")
     public AjaxResult list(PersonBasicInfo info) {
@@ -63,7 +63,7 @@ public class AppPersonBasicInfoController {
 
 
     /**
-     * 获取重点企业详细信息
+     * 查询人员信息详情
      */
     @GetMapping("/PersonBasicInfo/edit")
     public AjaxResult getInfo(EnvironmentBiggas biggas) {
@@ -122,6 +122,9 @@ public class AppPersonBasicInfoController {
         }
     }
 
+    /**
+     * 根据给定的人员类型，设置字典中文值
+     */
     private void setLabel(HashMap<String, Object> json, Integer type) {
         switch (type) {
             case 1:
@@ -159,7 +162,7 @@ public class AppPersonBasicInfoController {
     }
 
     /**
-     * 新增重点企业
+     * 新增人员信息
      */
     @PostMapping("/PersonBasicInfo")
     public AjaxResult add(@RequestBody String json) {
@@ -167,7 +170,7 @@ public class AppPersonBasicInfoController {
     }
 
     /**
-     * 修改重点企业
+     * 修改人员信息
      */
     @PostMapping("/PersonBasicInfo/put")
     public AjaxResult edit(@RequestBody String json) {
@@ -175,7 +178,9 @@ public class AppPersonBasicInfoController {
     }
 
 
-
+    /**
+     * 数据格式转换，将JSONString类型替换为List
+     */
     private String dataToList(String json){
         JSONObject jsonObject = JSONObject.parseObject(json);
         Set<String> strings = jsonObject.keySet();
@@ -189,18 +194,25 @@ public class AppPersonBasicInfoController {
     }
 
     /**
-     * 删除重点企业
+     * 删除人员信息
      */
     @GetMapping("/PersonBasicInfo/del")
     public AjaxResult remove(@RequestParam("id") List<String> id) {
         return personBasicInfoService.del(id.toArray(new String[0]));
     }
 
+    /**
+     * 审核删除人员信息
+     * state = 2 通过，  state = 1 拒绝
+     */
     @GetMapping("/PersonBasicInfo/delInfo")
     public AjaxResult delInfo(@RequestParam("id") String id, @RequestParam("state") String state){
         return personBasicInfoService.delInfo(id, state);
     }
 
+    /**
+     * 设置人员基础信息字典值
+     */
     private void setPersonBasicInfo(HashMap<String, Object> basicInfo) {//0
         Map<String, Object> comprehensiveDictCacheToMap = getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
         basicInfo.put("genderLabel", getDictData(DictKeys.COMPREHENSIVE_SEX, String.valueOf(basicInfo.get("gender"))));//性别字典值
@@ -216,11 +228,17 @@ public class AppPersonBasicInfoController {
 //        basicInfo.put("nativePlaceLabel", getDictData(DictKeys.COMPREHENSIVE_CITY_CODE, String.valueOf(basicInfo.get("nativePlace"))));//籍贯 2260
     }
 
+    /**
+     * 设置户籍人口字典值
+     */
     private void setRegisteredPopulation(HashMap<String, Object> json) {//1
         json.put("entryIdentityLabel", getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_IDENTIFICATION, String.valueOf(json.get("entryIdentity"))));//人户一致标识
         json.put("accountRelationshipLabel", getDictData(DictKeys.COMPREHENSIVE_RELATION, String.valueOf(json.get("accountRelationship"))));//与户主关系
     }
 
+    /**
+     * 设置流动人口字典值
+     */
     private void setFloatingPopulation(HashMap<String, Object> json) {//2
         json.put("inflowCauselabel", getDictData(DictKeys.COMPREHENSIVE_INFLOW_REASON, String.valueOf(json.get("inflowCause"))));//流入原因
         json.put("focusPeopleLabel", "1".equals(json.get("focusPeople")) ? "是" : "否");//是否重点关注人员
@@ -228,6 +246,9 @@ public class AppPersonBasicInfoController {
         json.put("domicileTypeLabel", getDictData(DictKeys.COMPREHENSIVE_RESIDENCE_TYPE, String.valueOf(json.get("domicileType"))));//住所类型
     }
 
+    /**
+     * 设置留守人口字典值
+     */
     private void setLeftBehindPerson(HashMap<String, Object> json) {//3
         json.put("entryIdentityLabel", getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_IDENTIFICATION, String.valueOf(json.get("entryIdentity"))));//人户一致标识
         json.put("leftBehindTypeLabel", getDictData(DictKeys.COMPREHENSIVE_LEFT_BEHIND_PERSONNEL_TYPE, String.valueOf(json.get("leftBehindType"))));//留守人员类型
@@ -236,11 +257,17 @@ public class AppPersonBasicInfoController {
         json.put("keyFamilyHealthStatusLabel", null == json.get("keyFamilyHealthStatus") ? null : getDictData(DictKeys.COMPREHENSIVE_HEALTH_STATUS, String.valueOf(json.get("keyFamilyHealthStatus"))));//家庭主要成员健康状况
     }
 
+    /**
+     * 设置校园周边重点人员字典值
+     */
     private void setCampusAroundPerson(HashMap<String, Object> json) {//4
         json.put("harmLevelLabel", getDictData(DictKeys.COMPREHENSIVE_DEGREE_OF_HARM, String.valueOf(json.get("harmLevel"))));//危害程度
         json.put("focusPeopleLabel", "1".equals(json.get("focusPeople")) ? "是" : "否");//是否关注
     }
 
+    /**
+     * 设置刑满释放人员字典值
+     */
     private void setPrisonReleased(HashMap<String, Object> json) {//5
         json.put("originalChargeLabel", getDictData(DictKeys.COMPREHENSIVE_OFFENCES_CLASSIFICATION, String.valueOf(json.get("originalCharge"))));//原罪名
         json.put("recidivismLabel", "1".equals(json.get("recidivism")) ? "是" : "否");//是否累犯
@@ -250,6 +277,9 @@ public class AppPersonBasicInfoController {
         json.put("reoffendLabel", "1".equals(json.get("reoffend")) ? "是" : "否");//是否重新犯罪
     }
 
+    /**
+     * 设置社区矫正人员字典值
+     */
     private void setCommunityCorrectionStaff(HashMap<String, Object> json) {//6
         json.put("caseCategoryLabel", getDictData(DictKeys.COMPREHENSIVE_CASE_CATEGORY, String.valueOf(json.get("caseCategory"))));//案件类别
         json.put("correctiveReleaseTypeLabel", null == json.get("correctiveReleaseType") ? null : getDictData(DictKeys.COMPREHENSIVE_CORRECTIVE_RELEASE_TYPE, String.valueOf(json.get("correctiveReleaseType"))));//矫正解除（终止）类型
@@ -265,6 +295,9 @@ public class AppPersonBasicInfoController {
         json.put("correctionTeamCompositionListLabel", getDictDataList(DictKeys.COMPREHENSIVE_CORRECTIONS_TEAM_COMPOSITION_TYPE, (List<String>) json.get("correctionTeamCompositionList")));//矫正小组人员组成情况
     }
 
+    /**
+     * 设置肇事肇祸及严重精神障碍患者字典值
+     */
     private void setPsychosisPopulation(HashMap<String, Object> json) {//7
         json.put("familyEconomicSituationLabel", null == json.get("familyEconomicSituationLabel") ? null : getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_FINANCIAL_SITUATION, String.valueOf(json.get("familyEconomicSituationLabel"))));//家庭经济状况
         json.put("subsistenceAllowanceLabel", "1".equals(json.get("subsistenceAllowance")) ? "是" : "否");//是否纳入低保
@@ -277,6 +310,9 @@ public class AppPersonBasicInfoController {
         json.put("assistanceSituationListLabel", getDictDataList(DictKeys.COMPREHENSIVE_HELP_SITUATION, (List<String>) json.get("assistanceSituationList")));//帮扶情况
     }
 
+    /**
+     * 设置吸毒人员字典值
+     */
     private void setDrugAddict(HashMap<String, Object> json) {//8
         json.put("controlSituationLabel", getDictData(DictKeys.COMPREHENSIVE_GOVERNANCE, String.valueOf(json.get("controlSituation"))));//管控情况
         json.put("criminalHistoryLabel", null == json.get("criminalHistory") ? null : "1".equals(json.get("criminalHistory")) ? "有" : "无");//有无犯罪史
@@ -284,6 +320,9 @@ public class AppPersonBasicInfoController {
         json.put("drugAbuseLabel", null == json.get("drugAbuse") ? null : getDictData(DictKeys.COMPREHENSIVE_CASE_CONSEQUENCE, String.valueOf(json.get("drugAbuse"))));//吸毒后果
     }
 
+    /**
+     * 设置艾滋病危险人员字典值
+     */
     private void setAidsRisk(HashMap<String, Object> json) {//9
         json.put("routeInfectionLabel", getDictData(DictKeys.COMPREHENSIVE_ROUTE_OF_INFECTION, String.valueOf(json.get("routeInfection"))));//感染途径
         json.put("criminalHistoryLabel", "1".equals(json.get("criminalHistory")) ? "是" : "否");//是否有违法犯罪史
@@ -292,6 +331,9 @@ public class AppPersonBasicInfoController {
         json.put("admissionSituationLabel", null == json.get("admissionSituation") ? null : getDictData(DictKeys.COMPREHENSIVE_ADMISSION_TO_INERTIA, String.valueOf(json.get("admissionSituation"))));//收治情况
     }
 
+    /**
+     * 设置重点青少年字典值
+     */
     private void setKeyYouth(HashMap<String, Object> json) {//10
         json.put("personTypeLabel", null == json.get("personType") ? null : getDictData(DictKeys.COMPREHENSIVE_TYPE_OF_PERSON, String.valueOf(json.get("personType"))));//人员类型
         json.put("familySituationLabel", getDictData(DictKeys.COMPREHENSIVE_FAMILY_INERTIA, String.valueOf(json.get("familySituation"))));//家庭情况
@@ -308,6 +350,9 @@ public class AppPersonBasicInfoController {
         return DictUtils.getDictDataListByValue(dictKey, values);
     }
 
+    /**
+     * 查询其他人员类型列表
+     */
     @GetMapping("/PersonBasicInfo/getOtherList")
     public AjaxResult getOtherList(PersonBasicInfo personBasicInfo){
         PageDomain pageDomain = TableSupport.buildPageRequest();
@@ -342,6 +387,9 @@ public class AppPersonBasicInfoController {
         }
     }
 
+    /**
+     * 查询其他类型人员详情
+     */
     @GetMapping("/PersonBasicInfo/getOtherEdit")
     public AjaxResult getOtherEdit(OtherPersonInfo otherPersonInfo){
         AjaxResult otherEdit = personBasicInfoService.getOtherEdit(otherPersonInfo.getBasicId(), otherPersonInfo.getPersonType());
@@ -362,7 +410,7 @@ public class AppPersonBasicInfoController {
                     data.put("registeredPopulation", data.remove("otherInfo"));
                     break;
                 case 2:
-                    setFloatingPopulation(data.get("ohterInfo"));
+                    setFloatingPopulation(data.get("otherInfo"));
                     data.put("floatingPopulation", data.remove("otherInfo"));
                     break;
                 case 3:
@@ -406,6 +454,9 @@ public class AppPersonBasicInfoController {
         }
     }
 
+    /**
+     * 查询全部有效的用户信息
+     */
     @GetMapping("/PersonBasicInfo/getAllUserInfo")
     public AjaxResult getAllUserInfo(PersonBasicInfo personBasicInfo){
         AjaxResult allUserInfo = personBasicInfoService.getAllUserInfo(personBasicInfo.getName());