Merge branch 'dev_v2.0.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.0.0

distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

@@ -267,6 +267,7 @@
         sys_user d ON a.create_id = d.id
         <where>
             and a.school_id = #{schoolId}
+            AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
                 #{item}
@@ -363,6 +364,7 @@
             sys_user d ON a.create_id = d.id
         <where>
             and a.school_id = #{schoolId}
+            AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
                 #{item}
@@ -429,6 +431,7 @@
         sys_user d ON a.create_id = d.id
         <where>
             and a.school_id = #{schoolId}
+            AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
                 #{item}

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -191,6 +191,10 @@ public class SysController {
         String loginName = loginParam.getLoginName();
         String password = loginParam.getPassword();
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(loginParam.getSchoolCode())) {
+            BasicSchool basicSchool = cacheService.schoolCache(loginParam.getSchoolCode());
+            wrapper.lambda().eq(SysUser::getSchoolId, basicSchool.getId());
+        }
         wrapper.lambda().eq(SysUser::getLoginName, loginName);
         SysUser user = sysUserService.getOne(wrapper);
         //用户不存在