Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!365

src/main/java/cn/timer/api/controller/LoginController.java

@@ -368,10 +368,14 @@ public class LoginController {
 					return ResultUtil.error("新密码与原密码相同，请修改后重试！");
 				}
 			} else {
-				String codeRedis = session.getAttribute(phone) != null ? session.getAttribute(phone).toString() : "";
-				if (!code.equals(codeRedis)) {
-					return ResultUtil.error("短信验证码错误");
+				
+				if(authentication_code ==null || ("").equals(authentication_code) || !authentication_code.equals(code)) {
+					String codeRedis = session.getAttribute(phone) != null ? session.getAttribute(phone).toString() : "";
+					if (!code.equals(codeRedis)) {
+						return ResultUtil.error("短信验证码错误");
+					}
 				}
+				
 				if (Md5.md5(pw).equals(dbPwd)) {
 					return ResultUtil.error("新密码与原密码相同，请修改后重试！");
 				}
@@ -405,9 +409,15 @@ public class LoginController {
 			if (code == null) {
 				return ResultUtil.error("请填写验证码");
 			}
-			if (!code.toString().equals(codeRedis)) {
-				return ResultUtil.error("验证码不符");
+			
+			
+			if(authentication_code ==null || ("").equals(authentication_code) || !authentication_code.equals(code)) {
+				if (!code.toString().equals(codeRedis)) {
+					return ResultUtil.error("验证码不符");
+				}
 			}
+			
+			
 			QyzxEmpLogin qyzxEmpLogin = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
 					.eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one();
 			if (qyzxEmpLogin != null) {

src/main/java/cn/timer/api/controller/kqgl/AttController.java

@@ -73,7 +73,9 @@ import cn.timer.api.bean.kqgl.SpecialDate;
 import cn.timer.api.bean.kqgl.SystemShift;
 import cn.timer.api.bean.kqgl.UserAttendanceRel;
 import cn.timer.api.bean.kqgl.UserEquiRelation;
+import cn.timer.api.bean.kqmk.KqglAssoYhkqz;
 import cn.timer.api.bean.kqmk.KqglAssoYhsb;
+import cn.timer.api.bean.kqmk.KqglMainKqz;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.Initialization.StaticVariable;
 import cn.timer.api.config.annotation.CurrentUser;
@@ -280,6 +282,17 @@ public class AttController {
 			attscheduling.setQyid(qyid);
 			
 			List<Schedule> schlist = scheduleservice.selectAttGroupScheduling(attscheduling);
+			
+			
+			List<KqglAssoYhkqz> kqzs = KqglAssoYhkqz.builder().build().selectList(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getKqzid, attscheduling.getKqzid()));
+			for(KqglAssoYhkqz yhr : kqzs) {
+				Schedule sch = new Schedule();
+				sch.setUserid(yhr.getUserid());
+				YgglMainEmp yhna = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, yhr.getUserid()));
+				sch.setUsername(yhna.getName());
+				sch.setKqzid(attscheduling.getKqzid());
+				schlist.add(sch);
+			}
 	
 			return ResultUtil.data(schlist);
 	}

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -302,6 +302,39 @@ public class CmsController {
 				qyxxQueryDto.getTotalPage() == null ? 10 : qyxxQueryDto.getTotalPage());
 
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("organization_id", userBean.getOrgCode()).eq("status", 1).eq("releasestate", 0)
+				.eq(t != null && t > -1, "modularid", t).eq(r != null && r > -1, "releasestate", r)
+				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",
+						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
+						!StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
+				.and(!StrUtil.hasBlank(q), wq -> wq.like("userid", q).or().like("author", q).or().like("title", q))
+				.orderByDesc("addeddate");
+		IPage<CmsContent> cmsContentPage = CmsContent.builder().build().selectPage(page, queryWrapper);
+		List<CmsContent> cmsContents = cmsContentPage.getRecords();
+		cmsContentPage.getCurrent();
+		cmsContentPage.getPages();
+		cmsContentPage.getTotal();
+		cmsContentPage.getSize();
+		return ResultUtil.data(cmsContentPage, cmsContents, "企业OA讯息搜索成功");
+	}
+	
+	/**
+	 * 企业OA讯息查询
+	 */
+	@PostMapping(value = "/oaalllist")
+	@ApiOperation(value = "搜索OA讯息记录", httpMethod = "POST", notes = "接口发布说明")
+	public Result<Object> oaAllList(@CurrentUser UserBean userBean, @RequestBody QyxxQueryDto qyxxQueryDto) {
+		String s = qyxxQueryDto.getStartTime();
+		String e = qyxxQueryDto.getEndTime();
+		Integer t = qyxxQueryDto.getModularid();
+		Integer r = qyxxQueryDto.getReleasestate();
+		String q = qyxxQueryDto.getQuery();
+
+		Page<CmsContent> page = new Page<CmsContent>(
+				qyxxQueryDto.getCurrentPage() == null ? 1 : qyxxQueryDto.getCurrentPage(),
+				qyxxQueryDto.getTotalPage() == null ? 10 : qyxxQueryDto.getTotalPage());
+
+		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("organization_id", userBean.getOrgCode())
 				.eq(t != null && t > -1, "modularid", t).eq(r != null && r > -1, "releasestate", r)
 				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",

src/main/resources/mapping/kqgl/ShiftManagementMapper.xml

@@ -465,10 +465,12 @@
 			where bcsz.id in (
 				select pbmx.bcid from kqgl_asso_pbmx pbmx
 				where pbmx.kqzid = #{qyid,jdbcType=INTEGER}
-				<if test="overall != null" >
-					and SUBSTR(pbmx.`data`,1,7) = #{overall,jdbcType=VARCHAR}
-				</if>
+				
 				GROUP BY  pbmx.bcid
 			)
+			
+			<!-- <if test="overall != null" >
+					and SUBSTR(pbmx.`data`,1,7) = #{overall,jdbcType=VARCHAR}
+				</if> -->
   </select>	
 </mapper>
\ No newline at end of file