bug 修复

zhongrj

2023-12-28 daef9edffb73d542ff1eba4beb215ffc7b306254

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -17,6 +17,9 @@
package org.springblade.modules.system.controller;


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.PropertyNamingStrategy;
import com.alibaba.fastjson.serializer.SerializeConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -67,7 +70,7 @@
@NonDS
//@ApiIgnore
@RestController
@RequestMapping(AppConstant.APPLICATION_SYSTEM_NAME+"/user")
@RequestMapping(AppConstant.APPLICATION_SYSTEM_NAME + "/user")
@AllArgsConstructor
@Api(value = "用户管理", tags = "用户管理")
public class UserController {
@@ -85,6 +88,18 @@
   public R<UserVO> detail(User user) {
      User detail = userService.getOne(Condition.getQueryWrapper(user));
      return R.data(UserWrapper.build().entityVO(detail));
   }

   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "查看详情返回String", notes = "传入id")
   @GetMapping("/details")
//   @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
   public R<String> details(User user) {
      UserVO detail = userService.getuserById(user.getId());
      SerializeConfig config = new SerializeConfig();
      config.propertyNamingStrategy = PropertyNamingStrategy.SnakeCase;
      String json1 = JSON.toJSONString(detail, config);
      return R.data(json1);
   }

   /**
@@ -152,6 +167,7 @@

   /**
    * 按条件查询用户信息
    *
    * @param user
    * @return
    */
@@ -370,4 +386,13 @@
      return R.data(userService.getUserInfo(AuthUtil.getUserId()));
   }

   /**
    * 修改
    */
   @GetMapping("/getUserInfoByCode")
   @ApiOperation(value = "查询人员", notes = "houseCode")
   public R getUserInfoByCode(@RequestParam("houseCode") String houseCode, @RequestParam(value = "type",defaultValue = "2") String type) {
      return R.data(userService.getUserInfoByCode(houseCode,type));
   }

}