|
@ -890,6 +890,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
|
|
*/
|
|
*/
|
|
public JSONObject userInfoList(String name,String saasid,String roleId,int page,int size,String wechatId) throws Exception {
|
|
public JSONObject userInfoList(String name,String saasid,String roleId,int page,int size,String wechatId) throws Exception {
|
|
JSONObject result = new JSONObject();
|
|
JSONObject result = new JSONObject();
|
|
|
|
List<String>roleList=new ArrayList();
|
|
/* int start = 0 == page ? page++ : (page - 1) * size;
|
|
/* int start = 0 == page ? page++ : (page - 1) * size;
|
|
int end = 0 == size ? 15 : page * size;*/
|
|
int end = 0 == size ? 15 : page * size;*/
|
|
String realName = null == name ? "" : name;
|
|
String realName = null == name ? "" : name;
|
|
@ -951,6 +952,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
|
|
"\t\t\tusr .username AS \"username\",\n" +
|
|
"\t\t\tusr .username AS \"username\",\n" +
|
|
"\t\t\tusr .update_time AS \"updateTime\",\n" +
|
|
"\t\t\tusr .update_time AS \"updateTime\",\n" +
|
|
"\t\t\tusr .create_time AS \"createTime\",\n" +
|
|
"\t\t\tusr .create_time AS \"createTime\",\n" +
|
|
|
|
"\t\t\tusr .role_id AS \"roleId\",\n" +
|
|
"\t\t\tCASE \n" +
|
|
"\t\t\tCASE \n" +
|
|
"\t\tWHEN usr .enabled=0 THEN\n" +
|
|
"\t\tWHEN usr .enabled=0 THEN\n" +
|
|
"\t\t\t'已失效'\n" +
|
|
"\t\t\t'已失效'\n" +
|
|
@ -959,14 +961,14 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
|
|
"\t\tEND AS \"enabled\",\n" +
|
|
"\t\tEND AS \"enabled\",\n" +
|
|
"\t\tusr .mobile AS \"mobile\",\n" +
|
|
"\t\tusr .mobile AS \"mobile\",\n" +
|
|
"\t\tsaas. NAME AS \"saasName\",\n" +
|
|
"\t\tsaas. NAME AS \"saasName\",\n" +
|
|
"\t\tROLE . NAME AS \"roleName\"\n" +
|
|
|
|
|
|
// "\t\tROLE . NAME AS \"roleName\"\n" +
|
|
"\tFROM\n" +
|
|
"\tFROM\n" +
|
|
"\t\tbase_user usr,\n" +
|
|
"\t\tbase_user usr,\n" +
|
|
"\t\tbase_saas saas,\n" +
|
|
"\t\tbase_saas saas,\n" +
|
|
"\t\tbase_role ROLE\n" +
|
|
|
|
|
|
// "\t\tbase_role ROLE\n" +
|
|
"\tWHERE\n" +
|
|
"\tWHERE\n" +
|
|
"\t\tusr .saas_id = saas. ID\n" +
|
|
|
|
"\tAND usr .role_id = ROLE . ID\n" ;
|
|
|
|
|
|
"\t\tusr .saas_id = saas. ID\n" ;
|
|
|
|
// "\tAND usr .role_id = ROLE . ID\n" ;
|
|
if(!realName.equals(null) && !realName.equals("")){
|
|
if(!realName.equals(null) && !realName.equals("")){
|
|
finalSql = finalSql + " and usr . NAME LIKE '%"+realName+"%'";
|
|
finalSql = finalSql + " and usr . NAME LIKE '%"+realName+"%'";
|
|
}
|
|
}
|
|
@ -996,6 +998,19 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
|
|
areaDOList = userAreaDao.findAllByUserId(id);
|
|
areaDOList = userAreaDao.findAllByUserId(id);
|
|
map.put("area",areaDOList);
|
|
map.put("area",areaDOList);
|
|
}
|
|
}
|
|
|
|
if (map.get("roleId")!=null){
|
|
|
|
if (map.get("roleId").toString().contains(",")){
|
|
|
|
String[] roleIds=map.get("roleId").toString().split(",");
|
|
|
|
for (String role:roleIds){
|
|
|
|
RoleDO roleDO=roleDao.findOne(role);
|
|
|
|
roleList.add(roleDO.getName());
|
|
|
|
}
|
|
|
|
}else {
|
|
|
|
RoleDO roleDO=roleDao.findOne(map.get("roleId").toString());
|
|
|
|
roleList.add(roleDO.getName());
|
|
|
|
}
|
|
|
|
map.put("roleName",roleList);
|
|
|
|
}
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
String oracleSql="SELECT\n" +
|
|
String oracleSql="SELECT\n" +
|
|
@ -1023,7 +1038,21 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
|
|
areaDOList = userAreaDao.findAllByUserId(id);
|
|
areaDOList = userAreaDao.findAllByUserId(id);
|
|
map.put("area",areaDOList);
|
|
map.put("area",areaDOList);
|
|
}
|
|
}
|
|
|
|
if (map.get("roleId")!=null){
|
|
|
|
if (map.get("roleId").toString().contains(",")){
|
|
|
|
String[] roleIds=map.get("roleId").toString().split(",");
|
|
|
|
for (String role:roleIds){
|
|
|
|
RoleDO roleDO=roleDao.findOne(role);
|
|
|
|
roleList.add(roleDO.getName());
|
|
|
|
}
|
|
|
|
}else {
|
|
|
|
RoleDO roleDO=roleDao.findOne(map.get("roleId").toString());
|
|
|
|
roleList.add(roleDO.getName());
|
|
|
|
}
|
|
|
|
map.put("roleName",roleList);
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
}else {
|
|
}else {
|
|
@ -1036,6 +1065,19 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
|
|
areaDOList = userAreaDao.findAllByUserId(id);
|
|
areaDOList = userAreaDao.findAllByUserId(id);
|
|
map.put("area",areaDOList);
|
|
map.put("area",areaDOList);
|
|
}
|
|
}
|
|
|
|
if (map.get("roleId")!=null){
|
|
|
|
if (map.get("roleId").toString().contains(",")){
|
|
|
|
String[] roleIds=map.get("roleId").toString().split(",");
|
|
|
|
for (String role:roleIds){
|
|
|
|
RoleDO roleDO=roleDao.findOne(role);
|
|
|
|
roleList.add(roleDO.getName());
|
|
|
|
}
|
|
|
|
}else {
|
|
|
|
RoleDO roleDO=roleDao.findOne(map.get("roleId").toString());
|
|
|
|
roleList.add(roleDO.getName());
|
|
|
|
}
|
|
|
|
map.put("roleName",roleList);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|