src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.java
@@ -95,14 +95,14 @@ * @param id 考试id * @return */ int getApplyDeatailNum(Long id); int getApplyDeatailNum(@Param("id") Long id); /** * 查询已报名的的人信息集合 * @param id 考试id * @return */ List<ApplyVO> getApplyDetailList(Long id); List<ApplyVO> getApplyDetailList(@Param("id") Long id); /** * 查询保安员个人报名信息 @@ -117,14 +117,14 @@ * @param id 考试id * @return */ int getTrainDeatailNum(Long id); int getTrainDeatailNum(@Param("id") Long id); /** * 查询已培训报名的的人信息集合 * @param id 考试id * @return */ List<ApplyVO> getTrainDetailList(Long id); List<ApplyVO> getTrainDetailList(@Param("id") Long id); /** * 查询报名信息，取最新的一条（即当前userId,）applyId最大的一条记录 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -291,10 +291,8 @@ sa.user_id = bu.id WHERE 1=1 and is_exam = 1 and sa.apply_status = 2 and bu.is_apply = 1 and sa.exam_id is not null and sa.exam_id = #{id} </select> <!-- 查询培训考试人数--> @@ -309,10 +307,8 @@ sr.user_id = bu.id WHERE 1=1 and is_exam = 1 and sr.cancel = 1 and bu.is_train = 1 and sr.train_exam_id is not null and sr.train_exam_id = #{id} </select> <!--查询已报名的的人信息集合--> @@ -338,10 +334,8 @@ bd.id = bu.dept_id WHERE 1=1 and is_exam = 1 and sa.apply_status = 2 and bu.is_apply = 1 and sa.exam_id is not null and sa.exam_id = #{id} </select> <!--查询已培训报名的的人信息集合--> @@ -367,10 +361,8 @@ bd.id = bu.dept_id WHERE 1=1 and is_exam = 1 and sr.cancel = 1 and bu.is_train = 1 and sr.train_exam_id is not null and sr.train_exam_id = #{id} </select>
@@ -189,7 +189,7 @@ exam_score exam LEFT JOIN blade_user user ON exam.user_id = user.id WHERE 1 = 1 AND theory_grade is not null <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'"> <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1372091709474910209'"> AND user.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid!=''"> @@ -207,7 +207,7 @@ exam_score exam LEFT JOIN blade_user user ON exam.user_id = user.id WHERE 1 = 1 AND learn_grade is not null <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'"> <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1372091709474910209'"> AND user.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid!=''"> src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -79,7 +79,7 @@ <if test="information.stats!=null and information.stats!=''"> and i.stats=#{information.stats} </if> <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1123598813738675201'"> <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'"> and i.jurisdiction=#{information.jurisdiction} </if> <if test="information.departmentid!=null and information.departmentid!=''"> @@ -154,7 +154,7 @@ ) A ON H.departmentid = A.dept_id LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or u.examination_type is null ) and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id ) B ON H.departmentid = B.dept_id where 1=1 <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'"> and H.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid!=''"> @@ -204,7 +204,7 @@ <if test="deptid!=null and deptid!=''"> and H.departmentid = #{deptid} </if> <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'"> and H.jurisdiction = #{jurisdiction} </if> </select> @@ -252,7 +252,7 @@ GROUP BY dept_id ) B ON H.departmentid = B.dept_id where 1=1 <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'"> and H.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid!=''"> @@ -274,7 +274,7 @@ <if test="deptid!=null and deptid!=''"> and H.departmentid = #{deptid} </if> <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'"> and H.jurisdiction = #{jurisdiction} </if> </select> @@ -313,7 +313,7 @@ FROM `sys_dispatcher_unit` WHERE YEAR (end_time) >='2021' <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'"> and jurisdiction =#{jurisdiction} </if> <if test="deptid!=null and deptid!=''"> src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -350,7 +350,7 @@ } /** * 导入用户page-security-apply * 导入用户 */ @PostMapping("import-user") @ApiOperationSupport(order = 12) src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -276,7 +276,7 @@ and bu.dept_id = #{user.deptId} </if> <if test="user.isApply!=null"> and sa.is_apply = #{user.isApply} and bu.is_apply = #{user.isApply} </if> <if test="user.roleId!=null and user.roleId != ''"> and bu.role_id = #{user.roleId} @@ -441,6 +441,10 @@ sys_information si on bd.id = si.departmentid left join blade_role br on br.id = bu.role_id where 1=1 and bu.status = 1 @@ -450,7 +454,7 @@ </if> <if test="jurisdiction!=null and jurisdiction!=''"> and si.jurisdiction = #{jurisdiction} and dept_category=2 and br.role_alias = "公安管理员" </if> </select> @@ -462,6 +466,10 @@ blade_dept bd on bd.id = bu.dept_id left join blade_role br on br.id = bu.role_id where 1=1 and bu.status = 1 @@ -471,7 +479,7 @@ </if> <if test="jurisdiction!=null and jurisdiction!=''"> and bu.jurisdiction = #{jurisdiction} and dept_category=2 and br.role_alias = "公安管理员" </if> </select>
