Merge branch 'dev' of LiTaohong/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -161,9 +161,9 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "saasid", required = false) String saasid,
            @ApiParam(name = "userId", value = "userId")
            @RequestParam(value = "userId", required = false) String userId,
            @ApiParam(name = "roleCode", value = "roleCode")
            @RequestParam(value = "roleCode", required = false) String roleCode) throws Exception {
        JSONObject jsonObject = userService.generateUserOrgTree(saasid,userId,roleCode);
            @ApiParam(name = "roleId", value = "roleId")
            @RequestParam(value = "roleId", required = false) String roleId) throws Exception {
        JSONObject jsonObject = userService.generateUserOrgTree(saasid,userId,roleId);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
@@ -185,13 +185,13 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "realName", required = false) String realName,
            @ApiParam(name = "saasid", value = "saasid")
            @RequestParam(value = "saasid", required = false) String saasid,
            @ApiParam(name = "roleCode", value = "roleCode")
            @RequestParam(value = "roleCode", required = false) String roleCode,
            @ApiParam(name = "roleId", value = "roleId")
            @RequestParam(value = "roleId", required = false) String roleId,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = userService.userInfoList(realName,saasid, roleCode,page,size);
        JSONObject result = userService.userInfoList(realName,saasid, roleId,page,size);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -162,16 +162,11 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        Map<String, Object> userinfo = new HashedMap();
        UserDO user = userDao.findOne(id);
        RoleDO role = roleDao.findByCode(user.getRoleId());
        userinfo.put("id", user.getId());
        userinfo.put("name", user.getName());
        userinfo.put("role", role.getName());
        userinfo.put("roleCode", role.getCode());
        userinfo.put("system", role.getSystem());
        RoleDO role = null;
        if (user != null) {
            userinfo.put("id", user.getId());
            userinfo.put("name", user.getName());
            role = roleDao.findOne(user.getRoleId());
        }
        //获取角色
@@ -180,11 +175,10 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            userinfo.put("roleCode", role.getCode());
            userinfo.put("system", role.getSystem());
            if ("admin".equals(role.getCode())) {
                if ("admin".equals(role.getCode())) {
            if (RoleDO.BaseRoleType.admin.toString().equals(role.getType())) {
                if (RoleDO.BaseRoleType.admin.toString().equals(role.getCode())) {
                } else if ("saasAdmin".equals(role.getCode())) {
                } else if ("saasAdmin".equals(role.getCode())) {
                } else if (RoleDO.BaseRoleType.saasAdmin.toString().equals(role.getType())) {
                    if (org.apache.commons.lang3.StringUtils.isNotBlank(user.getId())) {
                        SaasDO saas = saasDao.findOne(user.getSaasId());
@@ -202,7 +196,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                    }
                } else if ("hosAdmin".equals(role.getCode())) {
                } else if (RoleDO.BaseRoleType.hosAdmin.toString().equals(role.getType())) {
                    String sql = "SELECT " +
                            " g.code AS orgCode, " +
                            " g.province_code AS provinceCode, " +