产业供地 街道添加查看所有申请页面

src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -1120,6 +1120,10 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 if (CommonUtils.isNull(entity.getFinal_result())) {
                     result.add(entity.getId().toString());
                 }
+            } else if (Constant.UserType.STREET.equals(ShiroUtils.getUserType())) {
+                if (Objects.equals(entity.getCreate_by(), ShiroUtils.getUserId())) {
+                    result.add(entity.getId().toString());
+                }
             } else {
                 result.add(entity.getId().toString());
             }
@@ -1165,20 +1169,21 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
     @Transactional
     public List<String> getProjectIdsc() {
 
-        //根据当前登录人所在街道 查出该街道所有人员的id 将此id列表作为create_by筛选条件
         List<String> result = new ArrayList<>();
         Example example = new Example(IndustrialLandSupplyDetail.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.orEqualTo("del_flag", "0");//不显示删除的
+        if (Objects.equals(Constant.UserType.GOVERNMENT, ShiroUtils.getUserEntity().getUser_type())) {
 
-//        List<String> streetUserIds = new ArrayList<>();
-//        if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
-//            List<User> userList = userService.findUsersByStreetId(ShiroUtils.getStreetId());
-//            for (User user : userList) {
-//                streetUserIds.add(user.getId() + "");
-//            }
-//            criteria.andIn("create_by", streetUserIds);
-//        }
+        } else if (Objects.equals(Constant.UserType.STREET, ShiroUtils.getUserEntity().getUser_type())) {
+            //根据当前登录人所在街道 查出该街道所有人员的id 将此id列表作为create_by筛选条件
+            List<String> streetUserIds = new ArrayList<>();
+            List<User> userList = userService.findUsersByStreetId(ShiroUtils.getStreetId());
+            for (User user : userList) {
+                streetUserIds.add(user.getId() + "");
+            }
+            criteria.andIn("create_by", streetUserIds);
+        }
 
         List<IndustrialLandSupplyDetail> list = industrialLandSupplyDetailDao.selectByExample(example);
         for (IndustrialLandSupplyDetail entity : list) {

src/main/resources/templates/admin/common/left.html

@@ -1379,6 +1379,11 @@
                            th:attr="data-href=@{/land_supply/list/2}" data-title="已处理">已处理</a>
                         <i class="icon-arrow"></i>
                     </li>
+                    <li shiro:hasPermission="S_LAND_SUPPLY_ALL">
+                        <a data-menu="S_LAND_SUPPLY_ALL"
+                           th:attr="data-href=@{/land_supply/list/3}" data-title="项目列表">项目列表</a>
+                        <i class="icon-arrow"></i>
+                    </li>
                 </ul>
             </dd>
         </dl>