Merge remote-tracking branch 'origin/master'

zhangherong

2025-06-24 bbfb4d9d66d230e4ae55d51bf2df1a747dc1a25a

Merge remote-tracking branch 'origin/master'

 src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -184,8 +184,8 @@
    /**
     * 负责产线
     */
    @Excel(name="负责产线",width = 15,dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
    @Dict(dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
    @Excel(name="负责产线",width = 15,dictTable ="base_factory",dicText = "factory_name",dicCode = "id")
    @Dict(dictTable ="base_factory",dicText = "factory_name",dicCode = "id")
    private String productionIds;

    /**

 src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -185,7 +185,7 @@

    <!-- 查询用户的所属产线名称信息 -->
    <select id="getProNamesByUserIds" resultType="org.jeecg.modules.system.vo.MdcUserProVo">
        SELECT p.production_name, up.user_id FROM mdc_user_production up, mdc_production p WHERE p.id = up.pro_id AND up.user_id IN
        SELECT p.factory_name productionName, up.user_id FROM base_user_factory up, base_factory p WHERE p.id = up.factory_id AND up.user_id IN
        <foreach collection="userIds" index="index" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>

 src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
server:
  port: 9999
  port: 9989
  tomcat:
    max-swallow-size: -1
  error:
@@ -126,9 +126,9 @@
        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
      datasource:
        master:
          url: jdbc:sqlserver://127.0.0.1:1433;databasename=LXZN_TEST_HANGYU;nullCatalogMeansCurrent=true
          url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_XHJ;nullCatalogMeansCurrent=true
          username: sa
          password: sa123
          password: 123
          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
  #redis 配置
  redis:
@@ -312,9 +312,9 @@
    #工控网/涉密网部署 0为涉密网 1为工控网
    deployType: 0
    #涉密网传输nc文件夹
    secretFolder: D:\\hy_test\\a
    secretFolder: D:\\opt
    #工控网监控nc文件夹
    workFolder: D:\\hy_test\\b
    workFolder: D:\\opt
sap:
  rfc:
    destination: SAP_RFC_DEST # 自定义的目标地址 RFC 目标名称

 src/main/resources/application.yml

@@ -2,5 +2,5 @@
  application:
    name: jeecg-system
  profiles:
    active: '@profile.name@'
#    active: dev
    #    active: '@profile.name@'
    active: dev