Merge remote-tracking branch 'origin/dev_2.1.0' into dev_2.1.0

virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalToolManageController.java

@@ -35,7 +35,7 @@ public class PhysicalToolManageController {
         return physicalToolManageService.queryConfigPhysicalToolPage(toolName, type, requireLocation, pageNum, pageSize);
     }
 
-    @ApiModelProperty("查询体格检查工具详细信息")
+    @ApiOperation("查询体格检查工具详细信息")
     @GetMapping("queryConfigPhysicalToolDetail")
     public PhysicalToolVO queryConfigPhysicalToolDetail(String id) {
         return physicalToolManageService.queryConfigPhysicalToolDetail(id);

virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/PhysicalToolVO.java

@@ -1,5 +1,6 @@
 package com.supervision.manage.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.supervision.model.ConfigPhysicalTool;
 import com.supervision.model.DefaultPhysicalIndicator;
 import io.swagger.annotations.ApiModel;

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java

@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -58,6 +59,8 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
         List<DefaultPhysicalIndicator> list = defaultPhysicalIndicatorService.lambdaQuery().eq(DefaultPhysicalIndicator::getItemId, id).list();
         if (CollUtil.isNotEmpty(list)) {
             bean.setDefaultPhysicalIndicatorList(list);
+        }else {
+            bean.setDefaultPhysicalIndicatorList(new ArrayList<>());
         }
         return bean;
     }

virtual-patient-model/src/main/java/com/supervision/model/User.java

@@ -46,7 +46,7 @@ public class User implements Serializable {
     /**
      * 用户角色编码，0管理员 1普通用户
      */
-    @ApiModelProperty("用户角色编码，0管理员 1普通用户")
+    @ApiModelProperty("用户角色编码，0管理员 1普通用户 2运营人员")
     private String roleCode;
 
     @ApiModelProperty("账号状态 0正常 1停用")

virtual-patient-web/src/main/java/com/supervision/controller/UserController.java

@@ -71,8 +71,7 @@ public class UserController {
             throw new BusinessException("用户名或密码有误！");
         }
         // 更新用户最近的登录时间
-        user.get().setRecentLoginTime(LocalDateTime.now());
-        userService.updateById(user.get());
+        userService.lambdaUpdate().set(User::getRecentLoginTime,LocalDateTime.now()).eq(User::getId, user.get().getId()).update();
         String token = TokenUtil.creatToken(JSONUtil.toJsonStr(user.get()));
 
         LoginResVO loginResVO = BeanUtil.toBean(user.get(), LoginResVO.class);