修复bug

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";						//文件服务器地址

src/main/resources/mybatis/datasource/healthmanagement/HealthRecordsMapper.xml

@@ -329,7 +329,7 @@
 			ISDELETE = '1'
 		where
 			HEALTHRECORDS_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
                  #{item}
 		</foreach>
 	</delete>

src/main/resources/mybatis/datasource/healthmanagement/HealthTrainingMapper.xml

@@ -236,7 +236,7 @@
 			ISDELETE = '1'
 		where
 			HEALTHTRAINING_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
                  #{item}
 		</foreach>
 	</delete>

src/main/resources/mybatis/datasource/healthmanagement/OccupationalHazardMapper.xml

@@ -204,7 +204,7 @@
 			ISDELETE = '1'
 		where
 			OCCUPATIONALHAZARD_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
                  #{item}
 		</foreach>
 	</delete>

src/main/resources/mybatis/datasource/healthmanagement/OccupationalHealthMapper.xml

@@ -191,7 +191,7 @@
 			ISDELETE = '1'
 		where
 			OCCUPATIONALHEALTH_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
                  #{item}
 		</foreach>
 	</delete>

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'

src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml

@@ -244,6 +244,7 @@
 		<include refid="Field"></include>
 		from
 		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
 	</select>
 
 	<!-- 批量删除 -->