Browse Source

chore(env) remove no need code

master
wangxiang 2 years ago
parent
commit
f88fef4403
  1. 5
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java
  2. 3
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java
  3. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
  4. 3
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml

5
kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java

@ -36,11 +36,6 @@ public class Role extends CommonEntity { @@ -36,11 +36,6 @@ public class Role extends CommonEntity {
*/
private String name;
/**
* 角色权限字符串
*/
private String code;
/**
* 显示顺序
*/

3
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java

@ -71,9 +71,6 @@ public class RoleController { @@ -71,9 +71,6 @@ public class RoleController {
@PostMapping("/save")
@PreAuthorize("@pms.hasPermission('role_add')")
public R save(@RequestBody Role role) {
if (StrUtil.isBlank(role.getCode()) && ObjectUtil.isNull(role.getId()) && StrUtil.isNotBlank(role.getName())) {
role.setCode(PinyinUtil.getAllFirstLetter(role.getName()));
}
roleService.insertRole(role);
return R.ok();
}

2
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml

@ -11,7 +11,7 @@ spring: @@ -11,7 +11,7 @@ spring:
cloud:
nacos:
discovery:
ip: @profiles.ip@
#ip: @profiles.ip@
server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
#server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@

3
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml

@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
<resultMap type="Role" id="RoleResult">
<id property="id" column="id"/>
<result property="name" column="name"/>
<result property="code" column="code"/>
<result property="sort" column="sort"/>
<result property="delFlag" column="del_flag"/>
<result property="createById" column="create_by_id"/>
@ -18,7 +17,7 @@ @@ -18,7 +17,7 @@
</resultMap>
<select id="selectRolesByUserId" parameterType="String" resultMap="RoleResult">
select distinct r.id, r.name, r.code, r.sort, r.del_flag, r.create_time, r.remarks
select distinct r.id, r.name, r.sort, r.del_flag, r.create_time, r.remarks
from sys_role r
left join sys_user_role ur on ur.role_id = r.id
left join sys_user u on u.id = ur.user_id

Loading…
Cancel
Save