Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!402

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

@@ -888,10 +888,16 @@ public class TimeCardController {
 	@ApiOperation(value = "26：新增/修改--打卡WIFI信息", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperation(value = "26：新增/修改--打卡WIFI信息", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 26)
 	@ApiOperationSupport(order = 26)
 	public Result<Object> PunchCardWIFI(@CurrentUser UserBean userBean,@RequestBody KqglAssoDkwx kqglassodkwx) {
 	public Result<Object> PunchCardWIFI(@CurrentUser UserBean userBean,@RequestBody KqglAssoDkwx kqglassodkwx) {
-		kqglassodkwx.setLuryid(userBean.getEmpNum());
-		kqglassodkwx.setLusjTime(new Date().getTime());
-		kqglassodkwx.setQyid(userBean.getOrgCode());
-		return kqglassodkwx.insertOrUpdate() ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
+		
+		List<KqglAssoDkwx> cxwifi = KqglAssoDkwx.builder().build().selectList(new QueryWrapper<KqglAssoDkwx>().lambda().eq(KqglAssoDkwx::getQyid, userBean.getOrgCode()).eq(KqglAssoDkwx::getMac, kqglassodkwx.getMac()));
+		if(cxwifi.size() > 0) {
+			return ResultUtil.error("此WiFi已存在");
+		}else {
+			kqglassodkwx.setLuryid(userBean.getEmpNum());
+			kqglassodkwx.setLusjTime(new Date().getTime());
+			kqglassodkwx.setQyid(userBean.getOrgCode());
+			return kqglassodkwx.insertOrUpdate() ? ResultUtil.success("添加成功!") : ResultUtil.error("添加失败!");
+		}
 	}
 	}
 	
 	
 	/**
 	/**