TRX 1 рік тому
батько
коміт
c94686a8c1

+ 2 - 3
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/projectAbout/OrgUserFaceController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 项目人员人脸管理
@@ -101,14 +100,14 @@ public class OrgUserFaceController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到当前用户人脸信息列表", description = "得到当前用户人脸信息列表")
     @RequestMapping(value = "getCurrentUserAllFace", method = {RequestMethod.POST})
-    public ResultContent<List<OrgUserFaceModel>> getCurrentUserAllFace(@RequestBody @Valid ProjectOidParam param) {
+    public ResultContent getCurrentUserAllFace(@RequestBody @Valid ProjectOidParam param) {
         return orgUserFaceService.getCurrentUserAllFace(param.getProjectOid());
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到指定用户人脸信息列表", description = "得到指定用户人脸信息列表")
     @RequestMapping(value = "getUserFace", method = {RequestMethod.POST})
-    public ResultContent<List<OrgUserFaceModel>> getUserFace(@RequestBody @Valid UserIdAndOidModel param) {
+    public ResultContent getUserFace(@RequestBody @Valid UserIdAndOidModel param) {
         return orgUserFaceService.getUserAllFace(param.getUserId(), param.getProjectOid());
     }
 

+ 4 - 4
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -396,7 +396,7 @@ public class OrgUserFaceService extends SuperService {
         return null;
     }
 
-    public ResultContent<List<OrgUserFaceModel>> getCurrentUserAllFace(String projectOid) {
+    public ResultContent<List<OrgUserFaceSimpleModel>> getCurrentUserAllFace(String projectOid) {
         String userId = getCurrentUserId();
         if (StringUtils.isEmpty(projectOid)) {
             projectOid = getCurrentProjectOid();
@@ -407,11 +407,11 @@ public class OrgUserFaceService extends SuperService {
         return getUserAllFace(userId, projectOid);
     }
 
-    public ResultContent<List<OrgUserFaceModel>> getUserAllFace(String userId, String projectOid) {
+    public ResultContent<List<OrgUserFaceSimpleModel>> getUserAllFace(String userId, String projectOid) {
         List<OrgUserFace> list = orgUserFaceDao.findByUserIdAndProjectOidOrderByCreateTimeDesc(userId, projectOid);
-        List<OrgUserFaceModel> models = new ArrayList<>();
+        List<OrgUserFaceSimpleModel> models = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(list)) {
-            models = list.stream().map(this::toModel).collect(Collectors.toList());
+            models = list.stream().map(this::toSimpleModel).collect(Collectors.toList());
         }
         return ResultContent.buildSuccess(models);
     }