Merge branch 'wvp-28181-2.0'

648540858

2023-01-13 dea44dcd78418ed3e7f191a73cee2b81a7a0019f

 src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java

@@ -12,14 +12,14 @@
public interface RoleMapper {

    @Insert("INSERT INTO user_role (name, authority, createTime, updateTime) VALUES" +
            "('${name}', '${authority}', '${createTime}', '${updateTime}')")
            "(#{name}, #{authority}, #{createTime}, #{updateTime})")
    int add(Role role);

    @Update(value = {" <script>" +
            "UPDATE user_role " +
            "SET updateTime='${updateTime}' " +
            "<if test=\"name != null\">, name='${name}'</if>" +
            "<if test=\"authority != null\">, authority='${authority}'</if>" +
            "SET updateTime=#{updateTime} " +
            "<if test=\"name != null\">, name=#{name}</if>" +
            "<if test=\"authority != null\">, authority=#{authority}</if>" +
            "WHERE id != 1 and id=#{id}" +
            " </script>"})
    int update(Role role);