ERP_override.git

			@@ -7,6 +7,7 @@
			<id property="id" column="id"/>
			<result property="loginName" column="login_name"/>
			<result property="userName" column="user_name"/>
			<result property="address" column="address"/>
			<result property="createTime" column="create_time"/>

			<collection property="userRoleList" ofType="com.example.erp.entity.userInfo.UserRole">
			@@ -28,6 +29,20 @@
			on b.role_id = c.id
			where state =1 and a.id != 1
			</select>
			<select id="findByAddress" resultMap="findAllMap">
			SELECT a.*,
			b.role_id,
			c.role
			FROM erp_user_info.user as a
			left join user_role as b
			on a.id = b.user_id
			left join role as c
			on b.role_id = c.id
			where state =1 and a.id != 1 and address is not null and address !=''
			<if test="userName != null and userName != '' and userName != 'null'">
			and user_name like concat('%',#{userName},'%')
			</if>
			</select>

			<select id="findOne" >
			SELECT *
			@@ -39,6 +54,12 @@
			SELECT *
			FROM erp_user_info.user
			where login_name=#{LoginName}
			</select>

			<select id="findOnePassWord" >
			SELECT *
			FROM erp_user_info.user
			where id=#{id} and password=#{passWord}
			</select>

			<insert id="register" useGeneratedKeys="true" keyProperty="id">
			@@ -66,4 +87,33 @@
			set state =0
			where id = #{id}
			</update>

			<update id="updatePassWordById">
			update erp_user_info.user
			set password=#{passWord},update_time=now()
			where id=#{id}
			</update>

			<update id="updateUserNameById">
			update erp_user_info.user
			set user_name=#{userName},update_time=now()
			where id=#{id}
			</update>
			<update id="updateProcessMp">
			update erp_user_info.user
			set address=#{process},update_time=now()
			where id=#{id}
			</update>


			<select id="selectOptimizeParmsById" resultType="String">
			SELECT optimize_parms FROM erp_user_info.user WHERE user_name = #{username}
			</select>

			<select id="getUserLog" >
			SELECT operator_id,operator,DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') AS format_create_time
			FROM erp_log.log
			WHERE create_time >= DATE_SUB(NOW(), INTERVAL 1 MONTH) and `function`='用户登录' order by create_time desc limit 0,100
			</select>

			</mapper>