lidongdong
2022-10-18 430212c19c1b0b8bf505477a58e2563d2ca9e47b
修改【后台账号管理】【密码重置】修改账号    bug
3个文件已修改
12 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/UserController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/TransactionEventMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -243,9 +243,9 @@
    @Authorization
    public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
    {
        if(config.getUserId()==null)
        if(config.getId()==null)
        {
            return error("userId不能为空");
            return error("Id不能为空");
        }
        if(StringUtils.isEmpty(config.getLoginName()))
flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
@@ -277,6 +277,7 @@
    @ApiModelProperty(name = "operationalGuidelineName", value = "操作指南名称")
    private  String  operationalGuidelineName;
    @ApiModelProperty(name = "classifyIds", value = "前端使用")
    private String classifyIds;
}
flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -47,6 +47,7 @@
        <id     property="transactionArea"      column="transaction_area"      />
        <id     property="transactionAreaUrl"      column="transaction_area_url"      />
        <id     property="transactionAreaName"      column="transaction_area_name"      />
        <id     property="classifyIds"      column="classify_ids"      />
    </resultMap>
@@ -100,6 +101,7 @@
            transaction_area,
            transaction_area_url,
            transaction_area_name,
            classify_ids,
            (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
                (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
                automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),
@@ -208,6 +210,7 @@
        <if test="transactionArea != null ">transaction_area,</if>
        <if test="transactionAreaUrl != null ">transaction_area_url,</if>
        <if test="transactionAreaName != null ">transaction_area_name,</if>
        <if test="classifyIds != null ">classify_ids,</if>
        update_time,
        create_time
        )values(
@@ -249,6 +252,7 @@
        <if test="transactionArea != null ">#{transactionArea},</if>
        <if test="transactionAreaUrl != null ">#{transactionAreaUrl},</if>
        <if test="transactionAreaName != null ">#{transactionAreaName},</if>
        <if test="classifyIds != null ">#{classifyIds},</if>
        sysdate(),
        sysdate()
        )
@@ -295,6 +299,7 @@
            <if test="transactionArea != null ">transaction_area=#{transactionArea},</if>
            <if test="transactionAreaUrl != null ">transaction_area_url=#{transactionAreaUrl},</if>
            <if test="transactionAreaName != null ">transaction_area_name=#{transactionAreaName},</if>
            <if test="classifyIds != null ">classify_ids=#{classifyIds},</if>
            update_time=sysdate()
        </set>
        where  id= #{id}