commit

jz-dm-apigateway/src/main/java/com/jz/dm/models/req/organizationManage/OrganizationManageListQueryReq.java

@@ -20,7 +20,13 @@ import java.io.Serializable;
 @ApiModel("组织管理查询请求体")
 public class OrganizationManageListQueryReq extends BasePageBean implements Serializable {
 
-    @ApiModelProperty(value = "组织名称/组织联系")
-    private String key;
+    @ApiModelProperty(value = "组织名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "组织编码(组织唯一标识)")
+    private String orgCode;
+
+    @ApiModelProperty(value = "组织联系人")
+    private String linkman;
 
 }

jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/OrganizationManageImpl.java

@@ -51,10 +51,15 @@ public class OrganizationManageImpl implements OrganizationManageService {
     public IPage<ApiOrg> listOrganization(OrganizationManageListQueryReq req) {
         IPage<ApiOrg> page = new Page<>(req.getPageNum(), req.getPageSize());
         QueryWrapper<ApiOrg> query = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(req.getKey())){
-            query.and(wrapper -> wrapper.like("org_name",req.getKey())
-                    .or().like("org_code",req.getKey())
-                    .or().like("linkman",req.getKey()));
+
+        if (StringUtils.isNotBlank(req.getOrgName())){
+            query.like("org_name",req.getOrgName());
+        }
+        if (StringUtils.isNotBlank(req.getLinkman())){
+            query.like("linkman",req.getLinkman());
+        }
+        if (StringUtils.isNotBlank(req.getOrgCode())){
+            query.eq("org_code",req.getOrgCode());
         }
         query.eq("is_deleted", 0);
         query.orderByDesc("create_date");