diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java index f25d0ec9f6..e5f599b49a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java @@ -54,6 +54,11 @@ public class UserRoleDTO implements Serializable { */ private String roleId; + /** + * 所属端App + */ + private String app; + /** * 角色Key值 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index 33a3974f41..5fdd6ca3db 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -43,6 +43,4 @@ public interface UserRoleDao extends BaseDao { **/ List getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); - boolean saveResiRole(UserRoleDTO userRoleDTO); - } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 715dd1a58d..54ff59b1c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; @@ -169,15 +170,23 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl - - er.id AS "id", - er.app AS "app", - er.role_name AS "roleName", - er.role_key AS "roleKey", - er.del_flag AS "delflag", - er.revision AS "revision", - er.created_by AS "createdby", - er.created_time AS "createdtime", - er.updated_by AS "updatedby", - er.updated_time AS "updatedtime" - - - - \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index 78e05818a4..dc4a525517 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -16,33 +16,6 @@ - - INSERT INTO user_role ( - id, - customer_id, - user_id, - role_id, - del_flag, - revision, - created_by, - created_time, - updated_by, - updated_time - )VALUES( - #{id}, - #{customerId}, - #{userId}, - #{roleId}, - #{delFlag}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime} - ) - - -