仁和区bug提交

101captain

2022-01-21 d783bf26027f740e51e9e1484e4b1fb4fd30235a

仁和区bug提交

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java

@@ -34,9 +34,9 @@
    @GetMapping("info")
    public R getUserInfo() {
        Long userId = this.getUserId();
        R r=userService.detailUser(userId);
        R<LoginUserInfoVO> r=userService.detailUser(userId);
        if(r.getData()!=null){
            LoginUserInfoVO loginUserInfoVO= (LoginUserInfoVO) r.getData();
            LoginUserInfoVO loginUserInfoVO=r.getData();
            if(StringUtils.isNotEmpty(loginUserInfoVO.getAreaCode())){
                switch (loginUserInfoVO.getAreaCode()){
                    case "510423": loginUserInfoVO.setCommunityName("西区运营后台");

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

@@ -224,7 +224,7 @@
     * @return 人员详情
     */
    @PostMapping("detailuser")
    R detailUser(@RequestParam("userId") Long userId);
    R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);

    /**
     * 设置用户标签

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -246,7 +246,7 @@
     * @return 人员详情
     */
    @PostMapping("detailuser")
    public R detailUser(@RequestParam("userId") Long userId) {
    public R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId) {
        return userService.detailUser(userId);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -157,7 +157,7 @@
     *            用户id
     * @return 人员详情
     */
    R detailUser(Long userId);
    R<LoginUserInfoVO> detailUser(Long userId);

    /**
     * 设置用户标签

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -635,7 +635,7 @@
     * @return 人员详情
     */
    @Override
    public R detailUser(Long userId) {
    public R<LoginUserInfoVO> detailUser(Long userId) {
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        if (userId < 100000000l) {
            SysUserDO sysUserDO = userDao.selectById(userId);