TRX 1 gadu atpakaļ
vecāks
revīzija
010d0212a8

+ 1 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/orgUser/OrganizationUserModel.java

@@ -63,6 +63,7 @@ public class OrganizationUserModel extends SuperModel {
     @Schema(description = "审核用户")
     private String reViewUserId;
 
+    @Schema(description = "审核用户名称")
     private String reViewUserName;
 
     private UserCountSimpleModel reViewUser;

+ 7 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/orgUser/OrganizationUserSearch.java

@@ -78,4 +78,11 @@ public class OrganizationUserSearch extends SuperSearch {
 
     @Schema(description = "")
     private String openid;
+
+    @Schema(description = "审核用户")
+    private String reViewUserId;
+
+    @Schema(description = "审核用户名称")
+    private String reViewUserName;
+
 }

+ 8 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationUserDaoImpl.java

@@ -150,6 +150,10 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
             criteria.and("addType").is(param.getAddType());
         }
 
+        if (StringUtils.isNotEmpty(param.getReViewUserId())) {
+            criteria.and("reviewUserId").is(param.getReViewUserId());
+        }
+
         // 模糊搜索
         List<Criteria> criterias = new ArrayList<>();
         // 用户名称
@@ -167,6 +171,10 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
             Pattern pattern = Pattern.compile("^.*" + param.getPhone() + ".*$");
             criterias.add(Criteria.where("phone").is(pattern));
         }
+        if (StringUtils.isNotEmpty(param.getReViewUserName())) {
+            Pattern pattern = Pattern.compile("^.*" + param.getReViewUserName() + ".*$");
+            criterias.add(Criteria.where("reViewUserName").is(pattern));
+        }
         if (!CollectionUtils.isEmpty(criterias)) {
             criteria.andOperator(criterias.toArray(new Criteria[]{}));
         }

+ 3 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/OrganizationUser.java

@@ -58,6 +58,9 @@ public class OrganizationUser extends SuperMain {
     @Schema(description = "审核用户")
     private String reViewUserId;
 
+    @Schema(description = "审核用户名称")
+    private String reViewUserName;
+
     @Schema(description = "审核时间")
     private Long reViewTime;
 

+ 3 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -406,7 +406,9 @@ public class OrganizationUserServiceImpl extends SuperService {
             // 拒绝
             organizationUser.setState(UserState.Locked);
         }
-        organizationUser.setReViewUserId(getCurrentUserId());
+        UserAccount userAccount = getCurrentUserAccount();
+        organizationUser.setReViewUserId(userAccount.getUserId());
+        organizationUser.setReViewUserName(userAccount.getCreateUserName());
         organizationUser.setReViewTime(System.currentTimeMillis());
         organizationUserDao.save(organizationUser);