Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!225

src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java

@@ -46,7 +46,7 @@ public class KqglServiceImpl implements KqglService {
 		YgglMainEmp emp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, leaveappr.getUserid()));
 		YgglMainEmp emp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, leaveappr.getUserid()));
 		
 		
 		int modifynumber = 1;
 		int modifynumber = 1;
-		KqglAssoLeaveBalance balan = kqglassoleavebalancemapper.selectOne(new QueryWrapper<KqglAssoLeaveBalance>().lambda().eq(KqglAssoLeaveBalance::getUserid, leaveappr.getUserid())
+		KqglAssoLeaveBalance balan = kqglassoleavebalancemapper.selectOne(new QueryWrapper<KqglAssoLeaveBalance>().lambda().eq(KqglAssoLeaveBalance::getUserid, leaveappr.getUserid()).eq(KqglAssoLeaveBalance::getOrgCode, leaveappr.getOrgcode())
 				.orderByDesc(KqglAssoLeaveBalance :: getModifyNumber).last("LIMIT 1"));
 				.orderByDesc(KqglAssoLeaveBalance :: getModifyNumber).last("LIMIT 1"));
 		if(balan != null) {
 		if(balan != null) {
 			modifynumber = balan.getModifyNumber()+1;
 			modifynumber = balan.getModifyNumber()+1;
@@ -72,7 +72,7 @@ public class KqglServiceImpl implements KqglService {
 				.endTime(new SimpleDateFormat("yyyy-MM-dd' 'HH:mm:ss").format(overappr.getEndtime())).build().insert();
 				.endTime(new SimpleDateFormat("yyyy-MM-dd' 'HH:mm:ss").format(overappr.getEndtime())).build().insert();
 		}
 		}
 		
 		
-		YgglMainEmp emp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, overappr.getUserid()));
+		YgglMainEmp emp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, overappr.getUserid()).eq(YgglMainEmp::getOrgCode, overappr.getOrgcode()));
 		
 		
 		//查询当前公司调休的id
 		//查询当前公司调休的id
 		KqglAssoLeaveRules learul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, emp.getOrgCode()).eq(KqglAssoLeaveRules::getRulesType, 2));
 		KqglAssoLeaveRules learul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, emp.getOrgCode()).eq(KqglAssoLeaveRules::getRulesType, 2));
@@ -80,7 +80,7 @@ public class KqglServiceImpl implements KqglService {
 		if(overappr.getCompensate() == 1) {
 		if(overappr.getCompensate() == 1) {
 			
 			
 			int modifynumber = 1;
 			int modifynumber = 1;
-			KqglAssoLeaveBalance balan = kqglassoleavebalancemapper.selectOne(new QueryWrapper<KqglAssoLeaveBalance>().lambda().eq(KqglAssoLeaveBalance::getUserid, overappr.getUserid())
+			KqglAssoLeaveBalance balan = kqglassoleavebalancemapper.selectOne(new QueryWrapper<KqglAssoLeaveBalance>().lambda().eq(KqglAssoLeaveBalance::getUserid, overappr.getUserid()).eq(KqglAssoLeaveBalance::getOrgCode, overappr.getOrgcode())
 					.orderByDesc(KqglAssoLeaveBalance :: getModifyNumber).last("LIMIT 1"));
 					.orderByDesc(KqglAssoLeaveBalance :: getModifyNumber).last("LIMIT 1"));
 			if(balan != null) {
 			if(balan != null) {
 				modifynumber = balan.getModifyNumber()+1;
 				modifynumber = balan.getModifyNumber()+1;

src/main/java/cn/timer/api/dto/kqmk/AttEvectionApprovalDto.java

@@ -21,6 +21,9 @@ public class AttEvectionApprovalDto {
 	@ApiModelProperty(value = "用户id", example = "")
 	@ApiModelProperty(value = "用户id", example = "")
 	private int userid;
 	private int userid;
 	
 	
+	@ApiModelProperty(value = "公司id", example = "")
+	private int orgcode;
+
 	@ApiModelProperty(value = "开始时间", example = "时间戳")
 	@ApiModelProperty(value = "开始时间", example = "时间戳")
 	private long starttime;
 	private long starttime;
 
 

src/main/java/cn/timer/api/dto/kqmk/AttLeaveApprovalDto.java

@@ -21,6 +21,9 @@ public class AttLeaveApprovalDto {
 	@ApiModelProperty(value = "用户id", example = "")
 	@ApiModelProperty(value = "用户id", example = "")
 	private int userid;
 	private int userid;
 	
 	
+	@ApiModelProperty(value = "公司id", example = "")
+	private int orgcode;
+
 	@ApiModelProperty(value = "请假类型", example = "具体传ID")
 	@ApiModelProperty(value = "请假类型", example = "具体传ID")
 	private int leavetype;
 	private int leavetype;
 
 

src/main/java/cn/timer/api/dto/kqmk/AttOvertimeApprovalDto.java

@@ -21,6 +21,9 @@ public class AttOvertimeApprovalDto {
 	@ApiModelProperty(value = "用户id", example = "")
 	@ApiModelProperty(value = "用户id", example = "")
 	private int userid;
 	private int userid;
 	
 	
+	@ApiModelProperty(value = "公司id", example = "")
+	private int orgcode;
+	
 	@ApiModelProperty(value = "加班类型", example = "具体传ID")
 	@ApiModelProperty(value = "加班类型", example = "具体传ID")
 	private int overtimetype;
 	private int overtimetype;
 
 

src/main/java/cn/timer/api/dto/kqmk/AttRepairApprovalDto.java

@@ -21,6 +21,9 @@ public class AttRepairApprovalDto {
 	@ApiModelProperty(value = "用户id", example = "")
 	@ApiModelProperty(value = "用户id", example = "")
 	private int userid;
 	private int userid;
 	
 	
+	@ApiModelProperty(value = "公司id", example = "")
+	private int orgcode;
+
 	@ApiModelProperty(value = "补卡时间", example = "时间戳")
 	@ApiModelProperty(value = "补卡时间", example = "时间戳")
 	private long cardrepltime;
 	private long cardrepltime;