Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -205,7 +205,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @return 产品信息
      */
     public RespDTO<IPage<LantoneProduct>> index(Page page, String name) {
-        IPage<User> res = this.selectProduct(page, name);
+        IPage<LantoneProduct> res = this.selectProduct(page, name);
         return RespDTO.onSuc(res);
     }
 }

user-service/src/main/java/com/diagbot/dto/GetConsoleUserInfoDTO.java

@@ -16,8 +16,14 @@ import lombok.Setter;
 @Setter
 public class GetConsoleUserInfoDTO {
 
-    private User user;
-    private Organization organization;
-    private UserAuthentication userAuthentication;
+//    private User user;
+//    private Organization organization;
+//    private UserAuthentication userAuthentication;
+    
+    private String organizationName;//机构名称
+    
+    private String userName;//用户名称
+    
+    private String userStatus;//用户认证状态
 
 }

user-service/src/main/java/com/diagbot/dto/QueryAuthProgressDTO.java

@@ -19,10 +19,10 @@ public class QueryAuthProgressDTO implements Serializable {
      */
     private static final long serialVersionUID = 1L;
 
-    private Integer status;
+    private Integer userStatus;//用户认证状态
+    
+    private String userStatusMsg;//用户认证状态信息
 
-    private Integer isReject;
-
-    private String rejectComment;
+    private String rejectComment;//认证被拒理由
 
 }

user-service/src/main/java/com/diagbot/facade/UserAuthenticationFacade.java

@@ -167,8 +167,8 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         UserAuthentication userAuthentication = this.getOne(qw);
 
         QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
-        queryAuthProgressDTO.setStatus(userAuthentication.getStatus());
-        queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
+        queryAuthProgressDTO.setUserStatus(userAuthentication.getStatus());
+        queryAuthProgressDTO.setUserStatusMsg(AuthStatusEnum.getName(userAuthentication.getStatus()));
         queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
 
         return queryAuthProgressDTO;

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -20,6 +20,7 @@ import com.diagbot.entity.UserOrganization;
 import com.diagbot.entity.UserRole;
 import com.diagbot.entity.wrapper.MenuWrapper;
 import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -187,7 +188,7 @@ public class UserFacade extends UserServiceImpl {
             //查询机构下是否已存在用户信息，如已存在，就抛异常,需求待核实
             Map paramMap1 = new HashMap();
             paramMap1.put("organization_id", orgId);
-            paramMap1.put("is_deleted", "N");
+            paramMap1.put("is_deleted", IsDeleteEnum.N.getKey());
             List<UserOrganization> res1 = userOrganizationFacade.selectByMap(paramMap1);
             if (ListUtil.isNotEmpty(res1)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户，不能再添加别的用户！");
@@ -411,13 +412,17 @@ public class UserFacade extends UserServiceImpl {
         Organization organization = organizationFacade.getByUserId(userId);
         QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
         qw.eq("user_id", userId);
-        qw.eq("is_deleted", "N");
+        qw.eq("is_deleted", IsDeleteEnum.N.getKey());
         UserAuthentication userAuthentication = userAuthenticationFacade.getOne(qw);
 
         GetConsoleUserInfoDTO getConsoleUserInfoDTO = new GetConsoleUserInfoDTO();
-        getConsoleUserInfoDTO.setUser(user);
-        getConsoleUserInfoDTO.setOrganization(organization);
-        getConsoleUserInfoDTO.setUserAuthentication(userAuthentication);
+        getConsoleUserInfoDTO.setUserName(user.getUsername());
+        getConsoleUserInfoDTO.setOrganizationName(organization.getName());
+        getConsoleUserInfoDTO.setUserStatus(AuthStatusEnum.getName(userAuthentication.getStatus()));
+        
+//        getConsoleUserInfoDTO.setUser(user);
+//        getConsoleUserInfoDTO.setOrganization(organization);
+//        getConsoleUserInfoDTO.setUserAuthentication(userAuthentication);
 
         return getConsoleUserInfoDTO;
     }