项目列表修改

epdc-cloud-events/pom.xml

@@ -175,7 +175,7 @@
                 <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.item.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -82,6 +83,7 @@ import com.elink.esua.epdc.modules.item.service.*;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.rolecategory.service.HandleRoleCategoryService;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -178,31 +180,25 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             throw new RuntimeException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
-            if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
-                Result<SysDeptDTO> resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(params.get("streetId").toString()));
+            String deptId = MapUtils.getString(params, "deptId");
+            if (StringUtils.isNotBlank(deptId)) {
+                Result<SysDeptDTO> resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(deptId));
+                if (resultdept.success()) {
                     SysDeptDTO dept = resultdept.getData();
-                Object deptId = params.get("streetId");
                     if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) {
                         params.put("districtDeptId", deptId);
-                    params.remove("streetId");
+                        params.remove("deptId");
                     }
                 }
             }
-        //部门ID列表
-        List<Long> deptIdList = new ArrayList<>();
-        // 判断是否为网格，不为网格只能查看本部门下的项目数据
-        if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) {
-            deptIdList = user.getDeptIdList();
-        } else {
-            deptIdList.add(user.getDeptId());
-        }
-        params.put("deptIdList", null);
-        if (null != deptIdList && deptIdList.size() > 0) {
-            params.put("deptIdList", deptIdList);
         }
+        // 判断是否为网格，不为网格只能查看本部门下的项目数据
+        params.put("deptIdList", OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey()) ? user.getDeptIdList() : Arrays.asList(user.getDeptId()));
+
         if (null != params.get("itemCode")) {
             params.put("itemCode", params.get("itemCode").toString().trim());
         }
+
         IPage<ItemPendingHandleDTO> page = getPage(params);
         List<ItemPendingHandleDTO> list = baseDao.selectListOfPendingHandleItems(params);
         return new PageData<>(list, page.getTotal());

epdc-cloud-events/src/main/resources/mapper/item/ItemDao.xml

@@ -440,17 +440,8 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
-            <if test="gridId != null and gridId != ''">
-                AND (item.GRID_ID = #{gridId}
-                OR find_in_set(#{gridId},item.ALL_DEPT_IDS))
-            </if>
-            <if test="streetId != null and streetId != ''">
-                AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS)
-                OR find_in_set(#{streetId},item.ALL_DEPT_IDS))
-            </if>
-            <if test="communityId != null and communityId != ''">
-                AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS)
-                OR find_in_set(#{communityId},item.ALL_DEPT_IDS))
+            <if test="deptId != null and deptId != ''">
+                AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
             </if>
         <if test="itemCode != null and itemCode != ''">
             AND item.ITEM_CODE like concat('%', #{itemCode}, '%')