Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!153

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

@@ -1263,7 +1263,7 @@ public class AttController {
 	@GetMapping(value="/AttReminderStaff/{id}")
 	@GetMapping(value="/AttReminderStaff/{id}")
 	@ApiOperation(value = "提醒人员", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "提醒人员", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 34)
 	@ApiOperationSupport(order = 34)
-	public Result<List<YgglMainEmp>> getAttReminderStaff(@PathVariable("id") Integer id) {
+	public Result<List<YgglMainEmp>> getAttReminderStaff(@PathVariable("id") Integer id,@CurrentUser UserBean userBean) {
 		
 		
 		List<YgglMainEmp> yggl = new ArrayList<YgglMainEmp>();
 		List<YgglMainEmp> yggl = new ArrayList<YgglMainEmp>();
 		AttendanceGroup attgro = attendancegroupservice.selectByPrimaryKey(id);
 		AttendanceGroup attgro = attendancegroupservice.selectByPrimaryKey(id);
@@ -1276,7 +1276,7 @@ public class AttController {
 			launchsstr = txry.substring(0,txry.length() - 1);
 			launchsstr = txry.substring(0,txry.length() - 1);
 			for(int i=0;i<launchsArray.length;i++){
 			for(int i=0;i<launchsArray.length;i++){
 //				System.out.println(launchsArray[i]);
 //				System.out.println(launchsArray[i]);
-				YgglMainEmp txyg = attendancegroupservice.selectByPrimaryByempNum(Integer.valueOf(launchsArray[i]));
+				YgglMainEmp txyg = attendancegroupservice.selectByPrimaryByempNum(Integer.valueOf(launchsArray[i]),userBean.getOrgCode());
 				
 				
 				YgglMainEmp txyy = YgglMainEmp.builder().build();///
 				YgglMainEmp txyy = YgglMainEmp.builder().build();///
 				txyy.setId(txyg.getId());
 				txyy.setId(txyg.getId());

src/main/java/cn/timer/api/dao/kqgl/AttendanceGroupMapper.java

@@ -39,7 +39,7 @@ public interface AttendanceGroupMapper {
     
     
     List<YgglMainEmp> selectAttendanceOfficer(String orgCode,String text);
     List<YgglMainEmp> selectAttendanceOfficer(String orgCode,String text);
     
     
-    YgglMainEmp selectByPrimaryByempNum(Integer empNum);
+    YgglMainEmp selectByPrimaryByempNum(Integer empNum,Integer orgCode);
     
     
     List<YgglMainEmp> EmployeeListByorgCode(String orgCode);
     List<YgglMainEmp> EmployeeListByorgCode(String orgCode);
     
     

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

@@ -448,8 +448,8 @@
   </select>
   </select>
   
   
   <select id="selectByPrimaryByempNum" resultMap="YgglEmpInfoMap" parameterType="java.lang.Integer" >
   <select id="selectByPrimaryByempNum" resultMap="YgglEmpInfoMap" parameterType="java.lang.Integer" >
-    select * from yggl_main_emp
-    where emp_num = #{empNum,jdbcType=VARCHAR}
+    select * from yggl_main_emp emp
+    where emp.emp_num = #{empNum,jdbcType=VARCHAR} and emp.org_code = #{orgCode,jdbcType=INTEGER}
   </select>
   </select>