|
|
@ -18,14 +18,18 @@ import com.zdxt.enforcementcode.service.IEnterpriseInformationService; |
|
|
import com.zdxt.enforcementcode.service.ISsztJbxx110497NewService; |
|
|
import com.zdxt.enforcementcode.service.ISsztJbxx110497NewService; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
|
import org.dromara.common.core.domain.R; |
|
|
import org.dromara.common.mybatis.core.page.PageQuery; |
|
|
import org.dromara.common.mybatis.core.page.PageQuery; |
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
import org.dromara.common.mybatis.helper.DataPermissionHelper; |
|
|
import org.dromara.common.mybatis.helper.DataPermissionHelper; |
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
import org.dromara.common.web.core.BaseController; |
|
|
import org.dromara.common.web.core.BaseController; |
|
|
import org.dromara.system.domain.bo.QuerySysUserBo; |
|
|
import org.dromara.system.domain.bo.QuerySysUserBo; |
|
|
|
|
|
import org.dromara.system.domain.bo.SysDeptBo; |
|
|
import org.dromara.system.domain.bo.SysUserBo; |
|
|
import org.dromara.system.domain.bo.SysUserBo; |
|
|
|
|
|
import org.dromara.system.domain.vo.SysDeptVo; |
|
|
import org.dromara.system.domain.vo.SysUserVo; |
|
|
import org.dromara.system.domain.vo.SysUserVo; |
|
|
|
|
|
import org.dromara.system.service.ISysDeptService; |
|
|
import org.dromara.system.service.ISysUserService; |
|
|
import org.dromara.system.service.ISysUserService; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Controller; |
|
|
import org.springframework.stereotype.Controller; |
|
|
@ -58,6 +62,9 @@ public class AppEnfSystemController extends BaseController { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private ISsztJbxx110497NewService ssztJbxx110497NewService; |
|
|
private ISsztJbxx110497NewService ssztJbxx110497NewService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private ISysDeptService sysDeptService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 监督端查询执法人员&非执法人员 |
|
|
* 监督端查询执法人员&非执法人员 |
|
|
* 排除admin和手机号码为空的数据) |
|
|
* 排除admin和手机号码为空的数据) |
|
|
@ -210,8 +217,8 @@ public class AppEnfSystemController extends BaseController { |
|
|
* @param pageQuery |
|
|
* @param pageQuery |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
@SaIgnore |
|
|
|
|
|
@GetMapping("/queryUsersByPage") |
|
|
@PostMapping("/queryUsersByPage") |
|
|
public TableDataInfo<SysUserVo> queryUsersByPage(SysUserBo bo, PageQuery pageQuery) { |
|
|
public TableDataInfo<SysUserVo> queryUsersByPage(SysUserBo bo, PageQuery pageQuery) { |
|
|
if (null != bo.getNotUserId()) { |
|
|
if (null != bo.getNotUserId()) { |
|
|
Map<String, Object> params = bo.getParams(); |
|
|
Map<String, Object> params = bo.getParams(); |
|
|
@ -243,4 +250,16 @@ public class AppEnfSystemController extends BaseController { |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 查询部门 |
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
@SaIgnore |
|
|
|
|
|
@GetMapping("/dept") |
|
|
|
|
|
public R<List<SysDeptVo>> dept(SysDeptBo dept) { |
|
|
|
|
|
List<SysDeptVo> depts = sysDeptService.selectDeptList(dept); |
|
|
|
|
|
return R.ok(depts); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|