DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复角色查询无效的bug

Browse Source
This commit is contained in:
lixuetao
2023-12-13 20:14:19 +08:00
parent 81a4420a7f
commit c134f11742
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
+2 -2
View File
@@ -120,8 +120,8 @@ public class UserEOController extends BaseController<UserEO> {
@ApiOperation("获取所有用户")
@GetMapping("/list")
public ResponseMessage list(int page, int pageSize, String account, String uname) {
IPage<Map<String, Object>> list = userEOService.list(page, pageSize, account, uname);
public ResponseMessage list(int page, int pageSize, String account, String uname, String roleName) {
IPage<Map<String, Object>> list = userEOService.list(page, pageSize, account, uname, roleName);
list.getRecords().forEach(c -> {
try {
c.put("CELLPHONE_NUMBER", StringUtils.isNotEmpty(c.get("CELLPHONE_NUMBER")) ? EncryptUtil.decrypt(c.get("CELLPHONE_NUMBER").toString())
adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
+5 -2
View File
@@ -23,7 +23,8 @@ public interface UserEODao extends BaseMapper<UserEO> {
List<Map<String, Object>> list(@Param("current")int current ,@Param("size") int size ,
@Param("account") String account,
@Param("uname") String uname);
@Param("uname") String uname,
@Param("rolename") String rolename);
/**
* 查询用户及用户所对应的角色
@@ -49,7 +50,9 @@ public interface UserEODao extends BaseMapper<UserEO> {
List<UserEO> getOwnLeader(@Param("Vo") List<OrgEO> orgEOList);
long listCount(@Param("account") String account, @Param("uname") String uname);
long listCount(@Param("account") String account,
@Param("uname") String uname,
@Param("rolename") String rolename);
List<String> selectAccout();
adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
+3 -3
View File
@@ -303,14 +303,14 @@ public class UserEOServiceImpl implements IUserEoService {
}
@Override
public IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname) {
public IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname, String rolename) {
IPage page = new Page();
int i = pageNo - 1 ;
int current = i == 0 ? 0 : i * pageSize;
page.setCurrent(pageNo);
page.setSize(pageSize);
List<Map<String, Object>> list = dao.list(current, pageSize, account, uname);
long count = dao.listCount(account,uname);
List<Map<String, Object>> list = dao.list(current, pageSize, account, uname, rolename);
long count = dao.listCount(account,uname, rolename);
page.setTotal(count);
page.setRecords(list);
return page;
adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
+1 -1
View File
@@ -48,7 +48,7 @@ public interface IUserEoService {
*/
List<UserVO> getUserByIdListNodel(List<String> userIdList);
IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname);
IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String uname, String roleName);
void delete(String ids);
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+6 -1
View File
@@ -19,6 +19,9 @@
<if test="uname !='' and uname !=null">
and USNAME like CONCAT('%',CONCAT(#{uname},'%'))
</if>
<if test="rolename !='' and rolename !=null">
and tr.NAME like CONCAT('%',CONCAT(#{rolename},'%'))
</if>
ORDER BY UPDATE_TIME DESC
LIMIT #{current},#{size}
) t1
@@ -43,7 +46,9 @@
<if test="uname !='' and uname !=null">
and USNAME like CONCAT('%',CONCAT(#{uname},'%'))
</if>
<if test="rolename !='' and rolename !=null">
and tr.NAME like CONCAT('%',CONCAT(#{rolename},'%'))
</if>
</select>
<select id="getUserCount" resultType="java.lang.Long">