解开数据权限

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

@@ -43,7 +43,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -79,7 +78,7 @@ public class PersonTestingV2Controller {
     }
 
     @PostMapping
-    public Result save(@RequestBody PersonTestingDTO dto) throws ParseException {
+    public Result save(@RequestBody PersonTestingDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         return personTestingService.saveScanningInfoV2(dto);

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());

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/rocketmq/consumer/PersonTestingModifyConsumer.java

@@ -9,7 +9,6 @@ import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
 import com.elink.esua.epdc.rocketmq.dto.PersonTestingModifyDTO;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity;
-import com.elink.esua.epdc.vaccine.vim.dto.VaccinationAuthDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.spring.annotation.MessageModel;