src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
@@ -49,6 +49,8 @@ ( SELECT * FROM blade_dict WHERE code = 'notice' ) d ON n.category = d.dict_key left join sys_information si on si.departmentid = bd.id left join sys_jurisdiction sj on sj.id = si.jurisdiction WHERE n.is_deleted = 0 <if test="notice.title!=null"> @@ -63,6 +65,9 @@ <if test="notice.deptId!=null and notice.deptId!=''"> and n.dept_id = #{notice.deptId} </if> <if test="notice.jurisdiction!=null and notice.jurisdiction!='' and notice.jurisdiction!='1372091709474910209'"> and (sj.id=#{notice.jurisdiction} or sj.parent_id = #{notice.jurisdiction}) </if> <if test="notice.startTime!=null and notice.startTime!=''"> and n.release_time >= #{notice.startTime} </if> src/main/java/org/springblade/modules/desk/vo/NoticeVO.java
@@ -33,7 +33,7 @@ /** * 行政区（辖区）id */ private Long jurisdiction; private String jurisdiction; /** * 用户id src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -87,6 +87,8 @@ blade_dept bd on bd.id = bu.dept_id left join sys_information si on si.departmentid = bd.id left join sys_jurisdiction sj on sj.id = si.jurisdiction left join sys_training_registration str on @@ -111,6 +113,9 @@ </if> <if test="examScore.userId!=null and examScore.userId!=''"> and es.user_id = #{examScore.userId} </if> <if test="examScore.jurisdiction!=null and examScore.jurisdiction!='' and examScore.jurisdiction!='1372091709474910209'"> and (sj.id=#{examScore.jurisdiction} or sj.parent_id = #{examScore.jurisdiction}) </if> <if test="examScore.deptId!=null and examScore.deptId!=''"> and bd.id = #{examScore.deptId} @@ -379,6 +384,8 @@ sys_training_registration str on str.id = es.apply_id left join sys_information si on si.departmentid = bd.id left join sys_jurisdiction sj on sj.id = si.jurisdiction where 1=1 and (str.is_exam = 2 or str.is_exam = 3 or str.is_exam = 4 or str.is_exam = 5) @@ -433,6 +440,9 @@ <if test="examScore.examDate!=null and examScore.examDate!=''"> and date_format(ke.start_time,'%Y-%m-%d') = #{examScore.examDate} </if> <if test="examScore.jurisdiction!=null and examScore.jurisdiction!='' and examScore.jurisdiction!='1372091709474910209'"> and (sj.id=#{examScore.jurisdiction} or sj.parent_id = #{examScore.jurisdiction}) </if> <if test="examScore.sortName!=null and examScore.sortName!='' and examScore.sortName!='companyName'"> ORDER BY es.${examScore.sortName} ${examScore.sort},es.id desc </if> src/main/java/org/springblade/modules/talk/mapper/TalkMapper.java
@@ -16,6 +16,7 @@ */ package org.springblade.modules.talk.mapper; import org.apache.ibatis.annotations.Param; import org.springblade.modules.talk.entity.Talk; import org.springblade.modules.talk.vo.TalkVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -37,6 +38,6 @@ * @param talk * @return */ List<TalkVO> selectTalkPage(IPage page, TalkVO talk); List<TalkVO> selectTalkPage(IPage page, @Param("talk") TalkVO talk); } src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml
@@ -15,11 +15,17 @@ <result column="imgurl" property="imgurl"/> </resultMap> <!--自定义心理咨询分页查询--> <select id="selectTalkPage" resultMap="talkResultMap"> select * from sys_talk where 1=1 <if test="talk.deptid!=null and alk.deptid!='' and alk.deptid!='1123598813738675201'"> deptid=#{talk.deptid} select st.* from sys_talk st left join sys_information si on si.departmentid = st.deptid left join sys_jurisdiction sj on si.jurisdiction = sj.id where 1=1 <if test="talk.deptid!=null and talk.deptid!='' and talk.deptid!='1123598813738675201'"> and st.deptid=#{talk.deptid} </if> <if test="talk.jurisdiction!=null and talk.jurisdiction!='' and talk.jurisdiction!='1372091709474910209'"> and (sj.id=#{talk.jurisdiction} or sj.parent_id = #{talk.jurisdiction}) </if> </select>
@@ -33,4 +33,8 @@ public class TalkVO extends Talk { private static final long serialVersionUID = 1L; /** * 辖区id */ private String jurisdiction; } src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -30,6 +30,8 @@ ksxt_exam ke on ke.id = sr.train_exam_id left join sys_information si on si.departmentid = bt.id left join sys_jurisdiction sj on si.jurisdiction = sj.id WHERE 1=1 <if test="trainingRegistration.isExam!=null and trainingRegistration.isExam!=0"> @@ -68,6 +70,9 @@ <if test="trainingRegistration.isTrain!=null"> and bu.is_train = #{trainingRegistration.isTrain} </if> <if test="trainingRegistration.jurisdiction!=null and trainingRegistration.jurisdiction!='' and trainingRegistration.jurisdiction!='1372091709474910209'"> and (sj.id=#{trainingRegistration.jurisdiction} or sj.parent_id = #{trainingRegistration.jurisdiction}) </if> order by sr.id desc </select>
@@ -119,4 +119,9 @@ * 培训ids */ private String ids; /** * 辖区id */ private String jurisdiction; } src/main/resources/log/logback-test.xml
@@ -26,7 +26,7 @@ <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- 日志文件输出的文件名 --> <FileNamePattern>D:/log/info-%d{yyyy-MM-dd}.log</FileNamePattern> <FileNamePattern>E:/log/info-%d{yyyy-MM-dd}.log</FileNamePattern> </rollingPolicy> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern> @@ -43,7 +43,7 @@ <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- 日志文件输出的文件名 --> <FileNamePattern>D:/log/error-%d{yyyy-MM-dd}.log</FileNamePattern> <FileNamePattern>E:/log/error-%d{yyyy-MM-dd}.log</FileNamePattern> </rollingPolicy> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
