springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
@@ -61,4 +61,6 @@ private String checkStatus; @ApiModelProperty("id数组") private String ids; @ApiModelProperty("是否根据社区/村落隔离") private Integer type; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.acid.ComAcidStaticVO; import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelReturn; @@ -91,6 +92,12 @@ comActAcidRecordDTO.setLocalCity(this.getLoginUserInfo().getName()+","+comActAcidRecordDTO.getLocalCity()); } } LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); if (StringUtils.equals("pandashujuzhongxin", loginUserInfo.getAccount())){ comActAcidRecordDTO.setType(1); }else if (StringUtils.equals("pannongyenongcunju", loginUserInfo.getAccount())){ comActAcidRecordDTO.setType(2); } return this.communityService.selectAllComActAcidRecord(comActAcidRecordDTO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java
@@ -103,19 +103,19 @@ byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY); userInfo = new String(decrypt); LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class); //截取社区名 if (StringUtils.isEmpty(loginUserInfoVO.getCommunityName())) { R<LoginUserInfoVO> userInfoByUserId = userService.getUserInfoByUserId(loginUserInfoVO.getUserId().toString()); loginUserInfoVO = userInfoByUserId.getData(); } Integer type=null; if (loginUserInfoVO.getAccount().equals("pannongyenongcunju")){ type=2; }else if (loginUserInfoVO.getAccount().equals("pandashujuzhongxin")){ type=1; }else if (loginUserInfoVO.getAccount().equals("fangyipingtai")){ type=3; } // //截取社区名 // if (StringUtils.isEmpty(loginUserInfoVO.getCommunityName())) { // R<LoginUserInfoVO> userInfoByUserId = userService.getUserInfoByUserId(loginUserInfoVO.getUserId().toString()); // loginUserInfoVO = userInfoByUserId.getData(); // } Integer type=3; // if (loginUserInfoVO.getAccount().equals("pannongyenongcunju")){ // type=2; // }else if (loginUserInfoVO.getAccount().equals("pandashujuzhongxin")){ // type=1; // }else if (loginUserInfoVO.getAccount().equals("fangyipingtai")){ // type=3; // } return userService.communityList(type); }