Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-01 5aae43c2d47e8c7c5ea6457fbb2db99fa9357642

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -232,5 +232,8 @@
   </select>
   <select id="getUserByWorkShopDepartId" resultType="org.jeecg.modules.system.entity.SysUser">
      select * from sys_user where del_flag = 0 and id in (select user_id from mom_eam_work_shop_depart_user where work_shop_depart_id = #{workShopDepartId})
      <if test="username!=null and username!=''">
         and username = #{username}
      </if>
   </select>
</mapper>