Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.node.TreeNode;
@@ -132,10 +133,57 @@

   List<Map<String, Object>> selectUser();


   /**
    * 派遣人员
    * @param deptid
    * @param jurisdiction
    * @return
    */
   List<Map<String, Object>> getDispaterInfo(@Param("deptid")String deptid,
                           @Param("jurisdiction")String jurisdiction);

   /**
    * 工作汇报人员
    * @param deptid
    * @param jurisdiction
    * @return
    */
   List<Map<String, Object>> getWorkReportInfo(@Param("type")String type,
                                    @Param("deptid")String deptid,
                                    @Param("jurisdiction")String jurisdiction);

   /**
    * 工作汇报人员(向民警)
    * @param deptid
    * @param jurisdiction
    * @return
    */
   List<Map<String, Object>> getWorkReportInfos(@Param("type")String type,
                                    @Param("deptid")String deptid,
                                    @Param("jurisdiction")String jurisdiction);

   /**
    * 根据保安员编码查询保安信息
    * @param securityNumber 保安证编码
    * @return
    */
    UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);

   /**
    * 保安员信息
    * @param user
    * @return
    */
    UserVO getUserDetails(@Param("user") User user);


   DispatcherVO getDispatcherInfoByUserId(Long userId);

   /**
    * 查询账号相同的用户数量
    * @param account
    * @return
    */
    Integer selectCountAccount(@Param("account") String account);
}