Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-11-29 cdca588a565c7ba3cc22bf45c0701f5f0562783b

 hd/pipe/secure/src/main/resources/mapping/RegionInspectionMapper.xml

@@ -29,6 +29,9 @@
      <if test="companyId != null">
        companyId,
      </if>
      <if test="status != null">
        `status`,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
@@ -55,29 +58,37 @@
      <if test="companyId != null">
        #{companyId,jdbcType=VARCHAR},
      </if>
      <if test="status != null">
        #{status,jdbcType=INTEGER},
      </if>
    </trim>
    on duplicate key update
    <if test="task != null">
      task = #{task,jdbcType=VARCHAR},
    </if>
    <if test="standard != null">
      standard = #{standard,jdbcType=VARCHAR},
    </if>
    <if test="createUser != null">
      createUser = #{createUser,jdbcType=VARCHAR},
    </if>
    <if test="createTime != null">
      createTime = #{createTime,jdbcType=TIMESTAMP},
    </if>
    <if test="updateUser != null">
      updateUser = #{updateUser,jdbcType=VARCHAR},
    </if>
    <if test="updateTime != null">
      updateTime = #{updateTime,jdbcType=TIMESTAMP},
    </if>
    <if test="companyId != null">
      companyId = #{companyId,jdbcType=VARCHAR},
    </if>
    <trim suffixOverrides=",">
      <if test="task != null">
        task = #{task,jdbcType=VARCHAR},
      </if>
      <if test="standard != null">
        standard = #{standard,jdbcType=VARCHAR},
      </if>
      <if test="createUser != null">
        createUser = #{createUser,jdbcType=VARCHAR},
      </if>
      <if test="createTime != null">
        createTime = #{createTime,jdbcType=TIMESTAMP},
      </if>
      <if test="updateUser != null">
        updateUser = #{updateUser,jdbcType=VARCHAR},
      </if>
      <if test="updateTime != null">
        updateTime = #{updateTime,jdbcType=TIMESTAMP},
      </if>
      <if test="companyId != null">
        companyId = #{companyId,jdbcType=VARCHAR},
      </if>
      <if test="status != null">
        `status` = #{status,jdbcType=INTEGER},
      </if>
    </trim>

  </insert>

@@ -97,6 +108,7 @@
                                t.updateTime,
                                t.isUse,
                                t.companyId,
                                t.`status`,
                                GROUP_CONCAT(DISTINCT b.real_name ORDER BY b.job_num SEPARATOR '、') realNames,
                                GROUP_CONCAT(DISTINCT b.user_id ORDER BY b.job_num SEPARATOR '、') userIds,
                                GROUP_CONCAT(DISTINCT d.region ORDER BY c.sort SEPARATOR ',') regions,