Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-31 9b583c3ae9f78328368b2eda8899f80204ed796f

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -41,6 +41,9 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -633,7 +636,7 @@
    * @return
    */
   @Override
   public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction) {
   public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction,Long userId) {
      List<Map<String, Object>> list = new ArrayList<>();
      //派遣
      if (Integer.parseInt(type)==1){
@@ -646,10 +649,31 @@
      }
      //保安向民警
      if (Integer.parseInt(type)==3){
         Information information = new Information();
         information.setDepartmentid(deptid);
         Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
         list = baseMapper.getWorkReportInfo(type,null, one.getJurisdiction());
         //查询用户信息
         User user = this.getById(userId);
         //判断用户是否被派遣
         if (null!=user.getDispatch()){
            if (user.getDispatch().equals("0")) {
               //在派遣中，向派遣所在地辖区民警汇报
               //查询派遣信息
               DispatcherVO dispatcherVO = baseMapper.getDispatcherInfoByUserId(userId);
               list = baseMapper.getWorkReportInfos(null, null, dispatcherVO.getJurisdiction());
            }
            if (user.getDispatch().equals("1")){
               //未派遣或已派遣结束，向单位所在辖区民警汇报
               Information information = new Information();
               information.setDepartmentid(user.getDeptId());
               Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
               list = baseMapper.getWorkReportInfos(type,null, one.getJurisdiction());
            }
         }else {
            //未派遣或已派遣结束，向单位所在辖区民警汇报
            Information information = new Information();
            information.setDepartmentid(user.getDeptId());
            Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
            list = baseMapper.getWorkReportInfos(type,null, one.getJurisdiction());
         }

      }
      //民警对民警
      if (Integer.parseInt(type)==4){