Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2024-12-27 3c1f9d699497dcfc4b682502945a4ebee4c37e03

 north-glass-erp/src/main/resources/mapper/userInfo/User.xml

@@ -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">
@@ -41,6 +42,12 @@
        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">
        insert erp_user_info.user
            (password,user_name)
@@ -66,4 +73,21 @@
        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>
</mapper>