0226

src/main/resources/application-dev.yml

@@ -84,4 +84,7 @@ file:
         url: /upload/** # 映射url
         type: xlsx,xls,txt,jpeg,jpg,doc,ppt,pptx,png,pdf,rar,zip,wps,gif,docx #支持的文件类型
     excelTemplate:
-        url: /home/files/dms/templates/
+        url: /home/files/dms/templates/
+# 文件上传
+ruoyi:
+    profile: D:/Ezhizao/identity/

src/main/resources/application-linux.yml

@@ -92,3 +92,6 @@ file:
         type: xlsx,xls,txt,jpeg,jpg,doc,ppt,pptx,png,pdf,rar,zip,wps,gif,docx #支持的文件类型
     excelTemplate:
         url: /home/files/dms/templates/
+# 文件上传
+ruoyi:
+    profile: /home/files/dms/

src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -33,14 +33,14 @@
 
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
 		<include refid="selectDeptVo"/>
-		<if test="userId != 1">
+		<if test="userId != 1 and userId != null">
 			left join sys_dept_user du on du.dept_id = d.dept_id
 		</if>
 		where d.del_flag = '0'
 		<if test="deptId != null and deptId != 0">
 			AND d.dept_id = #{deptId}
 		</if>
-		<if test="userId != 1">
+		<if test="userId != 1 and userId != null">
 			and  du.is_formman = 1 and du.user_id = #{userId} and du.deleted = 0
 		</if>
 		<if test="tenantId != null and tenantId != 0">