diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index 1700b56..4700ce4 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -50,7 +50,7 @@ public class Const { public static final String IS_MAIN = "IS_MAIN"; //是否主账号 public static final String ISSUPERVISE = "ISSUPERVISE"; //是否监管部门 public static final String VIPLEVEL = "VIPLEVEL"; //企业会员等级 - public static final String DEFAULT_PASSWORD = "Aa@123456789"; //系统默认密码 + public static final String DEFAULT_PASSWORD = "666666"; //系统默认密码 public static final String FILEURL = "/mnt/qyag/file/"; //文件服务器地址 public static final String HTTPFILEURL = "https://file.zcloudchina.com/YTHFile"; //文件服务器地址 diff --git a/src/main/resources/mybatis/datasource/healthmanagement/HealthRecordsMapper.xml b/src/main/resources/mybatis/datasource/healthmanagement/HealthRecordsMapper.xml index 3ef00a8..6343de9 100644 --- a/src/main/resources/mybatis/datasource/healthmanagement/HealthRecordsMapper.xml +++ b/src/main/resources/mybatis/datasource/healthmanagement/HealthRecordsMapper.xml @@ -329,7 +329,7 @@ ISDELETE = '1' where HEALTHRECORDS_ID in - + #{item} diff --git a/src/main/resources/mybatis/datasource/healthmanagement/HealthTrainingMapper.xml b/src/main/resources/mybatis/datasource/healthmanagement/HealthTrainingMapper.xml index 6265a47..163566a 100644 --- a/src/main/resources/mybatis/datasource/healthmanagement/HealthTrainingMapper.xml +++ b/src/main/resources/mybatis/datasource/healthmanagement/HealthTrainingMapper.xml @@ -236,7 +236,7 @@ ISDELETE = '1' where HEALTHTRAINING_ID in - + #{item} diff --git a/src/main/resources/mybatis/datasource/healthmanagement/OccupationalHazardMapper.xml b/src/main/resources/mybatis/datasource/healthmanagement/OccupationalHazardMapper.xml index 5e137d4..449aa86 100644 --- a/src/main/resources/mybatis/datasource/healthmanagement/OccupationalHazardMapper.xml +++ b/src/main/resources/mybatis/datasource/healthmanagement/OccupationalHazardMapper.xml @@ -204,7 +204,7 @@ ISDELETE = '1' where OCCUPATIONALHAZARD_ID in - + #{item} diff --git a/src/main/resources/mybatis/datasource/healthmanagement/OccupationalHealthMapper.xml b/src/main/resources/mybatis/datasource/healthmanagement/OccupationalHealthMapper.xml index 3779701..af53f92 100644 --- a/src/main/resources/mybatis/datasource/healthmanagement/OccupationalHealthMapper.xml +++ b/src/main/resources/mybatis/datasource/healthmanagement/OccupationalHealthMapper.xml @@ -191,7 +191,7 @@ ISDELETE = '1' where OCCUPATIONALHEALTH_ID in - + #{item} diff --git a/src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml b/src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml index 0344d48..fbf4830 100644 --- a/src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml @@ -340,7 +340,7 @@ LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID left join bus_units b using (UNITS_ID) - LEFT JOIN vi_user_all vua on f.CREATOR = vua.USER_ID + LEFT JOIN vi_user_all vua on f.CREATOR = vua.USERNAME LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID LEFT JOIN bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC where f.ISDELETE = '0' diff --git a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml index b678957..30d1958 100644 --- a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml +++ b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml @@ -244,6 +244,7 @@ from f + where f.ISDELETE = '0'