审计字段修改

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/MtCompanyUser.java

@@ -49,14 +49,10 @@ public class MtCompanyUser {
 
 	private Date updateTime;
 
-	private Date deleteTime;
-
 	private Long createUserId;
 
 	private Long updateUserId;
 
-	private Long deleteUserId;
-
 	public MtCompanyUser(){}
 
 	public MtCompanyUser(MtCompanyUserRequest mtCompanyUserRequest){

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/Role.java

@@ -30,14 +30,10 @@ public class Role {
 
 	private Date updateTime;
 
-	private Date deleteTime;
-
 	private Long createUserId;
 
 	private Long updateUserId;
 
-	private Long deleteUserId;
-
 	private Integer deleteFlag;
 
 	public Role(){}

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/RoleRequest.java

@@ -2,8 +2,6 @@ package cn.com.ty.lift.system.user.dao.entity.model;
 
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author huangyuan
  * @date 2019-12-01
@@ -25,18 +23,6 @@ public class RoleRequest {
 
     private String menuIds;//菜单id，通过","连接的菜单id字符串
 
-    private Date createTime;
-
-    private Date updateTime;
-
-    private Date deleteTime;
-
-    private Long createUserId;
-
-    private Long updateUserId;
-
-    private Long deleteUserId;
-
     private Integer deleteFlag;
 
     private Long pageNum;

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/RoleMapper.java

@@ -1,9 +1,7 @@
 package cn.com.ty.lift.system.user.dao.mapper;
 
 import cn.com.ty.lift.system.user.dao.entity.Role;
-import cn.com.ty.lift.system.user.dao.entity.model.RoleRequest;
 import cn.com.xwy.boot.mybatis.MyBatisMapper;
-import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -13,11 +11,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @MyBatisMapper
 public interface RoleMapper extends BaseMapper<Role> {
 
-	/**
-	 * @description 获取角色列表
-	 * @date 2019/11/27 10:03 AM
-	 * @param roleRequest 角色请求类
-	 * @return
-	 */
-    RestResponse getByRoleRequest(RoleRequest roleRequest);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/UserInfoMapper.java

@@ -11,11 +11,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @MyBatisMapper
 public interface UserInfoMapper extends BaseMapper<UserInfo> {
 
-	/**
-	 * @description 用户信息对象
-	 * @date 2019/11/27 10:03 AM
-	 * @param userInfo 用户信息对象
-	 * @return
-	 */
-    UserInfo getByUserInfo(UserInfo userInfo);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/RoleService.java

@@ -97,8 +97,6 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
             return RestResponse.error(ApiConstants.RESULT_ERROR, "角色已关联用户，无法删除");
         }
         Role role = roleMapper.selectById(roleId);
-        role.setDeleteUserId(roleRequest.getDeleteUserId());
-        role.setDeleteTime(new Date());
         role.setDeleteFlag(ApiConstants.DELETE_YES);
         int updateCount = roleMapper.updateById(role);
         //删除角色菜单关联信息

lift-system-service/src/main/resources/mapper/MtCompanyUserMapper.xml

@@ -19,17 +19,15 @@
 		<result column="delete_flag" property="deleteFlag" jdbcType="INTEGER" />
 		<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
 		<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-		<result column="delete_time" property="deleteTime" jdbcType="TIMESTAMP" />
 		<result column="create_user_id" property="createUserId" jdbcType="BIGINT" />
-		<result column="update_user_id" property="updateUserId" jdbcType="BIGINT" />
 		<result column="delete_user_id" property="deleteUserId" jdbcType="BIGINT" />
 	</resultMap>
 
 	<sql id="Base_Column_List" >
 		id, mt_company_id, user_id, user_role, is_current_company, is_hx_registered, status, 
 		service_total, satisfaction_total, service_count, maintenance_total, emergency_total, 
-		lift_total, job, delete_flag, create_time, update_time, delete_time, create_user_id, 
-		update_user_id, delete_user_id
+		lift_total, job, delete_flag, create_time, update_time, create_user_id,
+		update_user_id
 	</sql>
 
 	<!-- 获取用户在当前公司所处的项目 -->

lift-system-service/src/main/resources/mapper/RoleMapper.xml

@@ -9,26 +9,14 @@
 		<result column="company_id" property="companyId" jdbcType="BIGINT" />
 		<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
 		<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-		<result column="delete_time" property="deleteTime" jdbcType="TIMESTAMP" />
 		<result column="create_user_id" property="createUserId" jdbcType="BIGINT" />
 		<result column="update_user_id" property="updateUserId" jdbcType="BIGINT" />
-		<result column="delete_user_id" property="deleteUserId" jdbcType="BIGINT" />
 		<result column="delete_flag" property="deleteFlag" jdbcType="INTEGER" />
 	</resultMap>
 
 	<sql id="Base_Column_List" >
-		id, name, code, description, company_id, create_time, update_time, delete_time, create_user_id, 
-		update_user_id, delete_user_id, delete_flag
+		id, name, code, description, company_id, create_time, update_time, create_user_id,
+		update_user_id, delete_flag
 	</sql>
 
-	<!-- 通过角色请求对象获取角色信息 -->
-	<select id="getByRoleRequest" parameterType="cn.com.ty.lift.system.user.dao.entity.model.RoleRequest" resultType="cn.com.ty.lift.system.user.dao.entity.Role">
-		select
-		<include refid="Base_Column_List"></include>
-		where 1 = 1
-		<if test="name != null">
-			and name like concat('%',#{name},'%')
-		</if>
-	</select>
-
 </mapper>