去除数据权限

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java

@@ -17,7 +17,11 @@
 
 package com.elink.esua.epdc.modules.epidemic.controller;
 
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -94,16 +98,25 @@ public class PersonTestingController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        UserDetail user = SecurityUser.getUser();
+        if (user == null) {
+            throw new RenException("用户未登录");
+        }
+        // 街道和超管有权查看所有数据
+        if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
+            params.put("deptIdList", user.getDeptIdList());
+            params.put("creatorId", user.getId());
+        }
         List<PersonTestingPageDTO> list = personTestingDao.getTestingPage(params);
         ExcelUtils.exportExcelToTarget(response, null, list, PersonTestingExcel.class);
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 读卡器录入数据
      * @author wangtong
      * @date 2021/8/20 18:11
      * @params [dto]
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @PostMapping("saveScanningInfo")
     public Result saveScanningInfo(@RequestBody PersonTestingDTO dto) {
@@ -111,11 +124,11 @@ public class PersonTestingController {
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 通过身份证号码查询手机号
      * @author wangtong
      * @date 2021/8/23 17:54
      * @params [dto]
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping("getMobileByIdCard")
     public Result getMobileByIdCard(PersonTestingDTO dto) {
@@ -123,5 +136,4 @@ public class PersonTestingController {
     }
 
 
-
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java

@@ -19,7 +19,11 @@ package com.elink.esua.epdc.modules.epidemic.controller.v2;
 
 import com.elink.esua.epdc.commons.api.version.ApiVersion;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -41,7 +45,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -100,6 +103,15 @@ public class PersonTestingV2Controller {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        UserDetail user = SecurityUser.getUser();
+        if (user == null) {
+            throw new RenException("用户未登录");
+        }
+        // 街道和超管有权查看所有数据
+        if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
+            params.put("deptIdList", user.getDeptIdList());
+            params.put("creatorId", user.getId());
+        }
         List<PersonTestingPageDTO> list = personTestingDao.getTestingPage(params);
         ExcelUtils.exportExcelToTarget(response, null, list, PersonTestingExcel.class);
     }
@@ -130,6 +142,7 @@ public class PersonTestingV2Controller {
 
     /**
      * 导出模板
+     *
      * @param
      * @return void
      * @Author zhangyong

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java

@@ -93,16 +93,16 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
     @Override
     public PageData<PersonTestingPageDTO> page(Map<String, Object> params) {
         IPage<PersonTestingPageDTO> page = getPage(params);
-
-        UserDetail user = SecurityUser.getUser();
-        if (user == null) {
-            throw new RenException("用户未登录");
-        }
-        // 街道和超管有权查看所有数据
-        if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
-            params.put("deptIdList", user.getDeptIdList());
-            params.put("creatorId", user.getId());
-        }
+//
+//        UserDetail user = SecurityUser.getUser();
+//        if (user == null) {
+//            throw new RenException("用户未登录");
+//        }
+//        // 街道和超管有权查看所有数据
+//        if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
+//            params.put("deptIdList", user.getDeptIdList());
+//            params.put("creatorId", user.getId());
+//        }
 
         List<PersonTestingPageDTO> list = baseDao.getTestingPage(params);
         return new PageData<>(list, page.getTotal());