协议bug修复

commons/src/main/java/com/jzg/commons/entity/vo/AgreementUserVo.java

@@ -21,4 +21,7 @@ public class AgreementUserVo {
 
     @Schema(description = "机构id")
     public String deptId;
+
+    @Schema(description = "机构名称")
+    public String deptName;
 }

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -57,7 +57,7 @@ public class SysSystemController {
     /**
      * 更新初始化配置
      * @param sysConfig
-     * @return
+     * @return 只传俩串json
      */
     @PostMapping("/updateConfig")
     @Operation(summary = "更新初始化配置")

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -23,7 +23,7 @@ import java.util.List;
 public interface SysSystemService extends IService<SysSystem> {
 
     /**
-     * 更新初始化配置
+     * 更新初始化配置（更新总的平台配置）
      * @return
      */
     public boolean updateConfig(SysConfig config);

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -249,8 +249,6 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                     sysSystem.setDivision(areaString.substring(0, areaString.length() - 1));
                 }
             });
-
-
         }
         return sysPage;
     }

tenant/organization/src/main/java/com/jzg/organization/controller/AgreementController.java

@@ -130,8 +130,8 @@ public class AgreementController extends BaseController {
      */
     @GetMapping(value = { "/getUserByDeptId"})
     @Operation(summary = "根据机构获取后线人员列表")
-    public HttpResult getUserByDeptId(String deptId) {
-        return HttpResult.ok(agreementService.getUserByDeptId(deptId));
+    public HttpResult getUserByDeptId(String deptId, String searchValue) {
+        return HttpResult.ok(agreementService.getUserByDeptId(deptId,searchValue));
     }
 
     /**

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserMapper.java

@@ -29,8 +29,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     /**
      * 根据机构获取后线人员列表
+     *
      * @param deptId
+     * @param searchValue
      * @return
      */
-    List<AgreementUserVo> getUserByDeptId(@Param("deptId") String deptId);
+    List<AgreementUserVo> getUserByDeptId(@Param("deptId") String deptId, @Param("searchValue") String searchValue);
 }

tenant/organization/src/main/java/com/jzg/organization/service/PtlAgreementService.java

@@ -2,7 +2,6 @@ package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.AgreementAddParam;
-import com.jzg.commons.entity.dto.AgreementAuthParam;
 import com.jzg.commons.entity.dto.AgreementEditParam;
 import com.jzg.commons.entity.dto.AgreementParam;
 import com.jzg.commons.entity.po.PtlAgreement;
@@ -11,8 +10,6 @@ import com.jzg.commons.entity.vo.AgreementInfoVo;
 import com.jzg.commons.entity.vo.AgreementUserVo;
 import com.jzg.commons.entity.vo.AgreementVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
 
 import java.util.List;
 
@@ -66,10 +63,12 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 根据机构获取后线人员列表
+     *
      * @param deptId
+     * @param searchValue
      * @return
      */
-    List<AgreementUserVo> getUserByDeptId(String deptId);
+    List<AgreementUserVo> getUserByDeptId(String deptId, String searchValue);
 
     /**
      * 批量删除协议

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.AgreementAddParam;
-import com.jzg.commons.entity.dto.AgreementAuthParam;
 import com.jzg.commons.entity.dto.AgreementEditParam;
 import com.jzg.commons.entity.dto.AgreementParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
@@ -20,13 +19,10 @@ import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
-import com.jzg.commons.util.idgen.IdGenerate;
-import com.jzg.commons.util.idgen.IdWorker;
 import com.jzg.organization.client.EsmInsCompanyClient;
 import com.jzg.organization.mapper.PtlAgreementMapper;
 import com.jzg.organization.mapper.SysUserMapper;
 import com.jzg.organization.service.*;
-import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
 * @author dongxin
@@ -185,8 +180,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     @Override
-    public List<AgreementUserVo> getUserByDeptId(String deptId) {
-        List<AgreementUserVo> userVoList = userMapper.getUserByDeptId(deptId);
+    public List<AgreementUserVo> getUserByDeptId(String deptId, String searchValue) {
+        List<AgreementUserVo> userVoList = userMapper.getUserByDeptId(deptId,searchValue);
         return userVoList;
     }
 

tenant/organization/src/main/resources/mapper/SysUserMapper.xml

@@ -63,15 +63,19 @@
             sur.user_id = #{userId}
     </select>
     <select id="getUserByDeptId" resultType="com.jzg.commons.entity.vo.AgreementUserVo">
-        SELECT suji.id, suji.user_id as userId, suji.name, su.mobile, suji.dept_id as deptId
+        SELECT suji.id, suji.user_id as userId, suji.name, su.mobile, suji.dept_id as deptId, sd.name as deptName
         FROM sys_user_jzg_info suji
         LEFT JOIN sys_user su on suji.user_id = su.id
+        LEFT JOIN sys_dept sd on sd.id = suji.dept_id
         <where>
             1=1
             and suji.is_delete = 0 and suji.type_attr = 2
             <if test="deptId != null and deptId != ''">
                 AND suji.dept_id = #{deptId}
             </if>
+            <if test="searchValue != null and searchValue != ''">
+                AND (suji.name = #{searchValue} or suji.mobile = #{searchValue} or suji.work_number = #{searchValue})
+            </if>
         </where>
         group by suji.id
         order by suji.create_time desc