修改人员基础信息查询

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit f79cc57f17df4a5a287b0b3f1907d7d7fa871f63
+Subproject commit df557141415794417f4b09250c10d73b5d0c4d8c

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 640458ab1be4f3e24a7c8e365c04f753bef6614e
+Subproject commit fa05d3fcdfa92d51c9c3f5b4746748d29ad168c4

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java

@@ -10,11 +10,13 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao;
 import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO;
 import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -35,6 +37,14 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer {
         Map<String, Object> params = (Map<String, Object>) queryParams;
         params.put("excelBigDataPageSize", 30000);
         params.put("excelBigDataPageIndex", (page - 1) * 30000);
+
+        String grids = (String) params.get("deptIdList");
+        params.put("deptIdList",null);
+        if(StringUtils.isNotBlank(grids)){
+            List<String> gridList = Arrays.asList(grids.split(","));
+            params.put("gridList",gridList);
+        }
+
         UserDetail user = SecurityUser.getUser();
         if (user == null) {
             throw new RenException("用户未登录");

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@@ -114,7 +114,12 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Override
     public PageData<EpidemicRecordListDTO> getPageList(Map<String, Object> params) {
         IPage<EpidemicRecordListDTO> page = getPage(params);
-
+        String grids = (String) params.get("deptIdList");
+        params.put("deptIdList",null);
+        if(StringUtils.isNotBlank(grids)){
+            List<String> gridList = Arrays.asList(grids.split(","));
+            params.put("gridList",gridList);
+        }
         UserDetail user = SecurityUser.getUser();
         if (user == null) {
             throw new RenException("用户未登录");

epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

@@ -143,6 +143,12 @@
                 #{id}
             </foreach>
         </if>
+        <if test="gridList != null and gridList.size() > 0">
+            and ui.dept_id in
+            <foreach item="id" collection="gridList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         <if test="nativePlace != null and nativePlace != ''">
             and ui.NATIVE_PLACE like '%${nativePlace}%'
         </if>