fix：修改bug

DESKTOP-71BH0QO\L、ming

2021-04-02 8555f974846ca5b4f4734f52b51e39cd4502df44

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1,19 +1,17 @@
package com.panzhihua.common.service.user;

import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.MenuVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -476,4 +474,166 @@
     */
    @PostMapping("/role/listmenubackstagebyrole")
    R listMenuBackstageByRole(@RequestParam("roleId") Long roleId);

    /**
     * 获取各种协议
     * @param type  1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
     * @return 协议内容
     */
    @PostMapping("agreement")
    R agreement(@RequestParam("type")Integer type);

    /**
     * 维护用户最后登录时间
     * @param userId 用户主键
     * @return 维护结果
     */
    @PostMapping("putuserlastlogintime")
    R putUserLastLoginTime(@RequestParam("userId")Long userId);

    /**
     * 删除意见反馈
     * @param id 主键
     * @return 删除结果
     */
    @PostMapping("deletefeedback")
    R deleteFeedback(@RequestParam("id")Long id);

    /**
     * 批量导入居民用户
     * @param list 居民用户集合
     * @param areaName 小区名字
     * @return 导入结果
     */
    @PostMapping("batchsaveuser")
    R batchSaveUser(@RequestBody List<EexcelUserDTO> list, @RequestParam("areaName")StringBuffer areaName);

    /**
     * 校验小区是否存在
     * @param areaName 小区名字
     * @return 校验结果
     */
    @PostMapping("checkaereaname")
    R checkAereaName(@RequestParam("areaName")String areaName);

    /**
     * 社区人员详情包括导入人员
     * @param userId 人员id
     * @return CommunityUserInfoVO
     */
    @PostMapping("detailusercomunity")
    R detailUserComunity(@RequestParam("userId")Long userId);

    /**
     *  用户搜索了就下载搜索的用户否则下载所有用户
     * @param exportUserDTO 用户搜索内容
     * @return List<EexcelUserDTO> excel内容
     */
    @PostMapping("export")
    R export(@RequestBody ExportUserDTO exportUserDTO);

    /**
     * 通过手机号码查询用户信息
     * @param phone
     * @return
     */
    @GetMapping("getUserByPhone")
    R getSysUserVOByPhone(@RequestParam(value = "phone") String phone);


    /**
     * 基础数据》居民管理》居民列表
     * @param pageInputUserDTO 查询参数
     * @return 分页数据
     */
    @PostMapping("common/data/user/page")
    R pageInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);

    /**
     * 基础数据》居民管理》设置用户标签
     * @param inputUserTagsDTO 标签信息
     * @return 设置结果
     */
    @PostMapping("common/data/user/tags")
    R setInputUserTag(@RequestBody InputUserTagsDTO inputUserTagsDTO);

    /**
     * 基础数据》居民管理》批量导入居民用户
     * @param list 居民用户集合
     * @param areaName 小区名字
     * @return 导入结果
     */
    @PostMapping("common/data/user/import")
    R batchSaveInputUser(@RequestBody List<EexcelUserDTO> list,@RequestParam("areaName")StringBuffer areaName);

    /**
     * 基础数据》居民管理》 居民详情
     * @param id 人员id
     * @return CommunityUserInfoVO
     */
    @PostMapping("/common/data/user/detail")
    R inputUserDetail(@RequestParam("id")Long id);

    /**
     *  基础数据》居民管理》 导出居民信息
     * @param exportUserDTO 用户搜索内容
     * @return List<EexcelUserDTO> excel内容
     */
    @PostMapping("/common/data/user/export")
    R inputUserExport(@RequestBody ExportUserDTO exportUserDTO);

    /**
     * 基础数据》特殊群体》分页查询
     * @param pageInputUserDTO
     * @return
     */
    @PostMapping("common/data/special/page")
    R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);

    /**
     * 删除特殊群体用户
     * @param id
     * @return
     */
    @DeleteMapping("common/data/special/delete")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);

    /**
     * 基础数据》特殊群体》分页查询标签列表
     * @param comMngUserTagDTO
     * @return
     */
    @PostMapping("common/data/special/tags/page")
    R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO);

    /**
     * 新增或修改特殊群体标签
     * @param comMngTagVO
     * @return
     */
    @PostMapping("common/data/special/tags/save")
    R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO);

    /**
     * 删除特殊群体标签
     * @param id
     * @return
     */
    @DeleteMapping("common/data/special/tags/delete")
    R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id);

    /**
     * 特殊群体导出
     * @param exportSpecialUserDTO
     * @return
     */
    @PostMapping("/common/data/special/export")
    R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO);

    /**
     * 查询所有人员标签
     * @return 标签集合
     */
    @PostMapping("listtag/getTag")
    R listTags(@RequestParam("communityId") Long communityId);
}