Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java

@@ -45,7 +45,7 @@ public class HealthPersonInfoController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(HealthPersonInfo healthPersonInfo) {
         startPage();
-        System.out.println(healthPersonInfo.getPlaceIds());
+        System.out.println(healthPersonInfo.getDeptIds());
         List<HealthPersonInfo> list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo);
         return getDataTable(list);
     }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java

@@ -174,4 +174,6 @@ public class HealthPersonInfo extends BaseEntity {
     private Date updateTime;
     private String doctorAdvices;
     private String placeIds;
+    private String deptIds;
+
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml

@@ -82,6 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="doctorAdvices != null and doctorAdvices != ''">
             and b.doctor_advice in (${doctorAdvices})
         </if>
+        <if test="deptIds != null and deptIds != ''">
+            and a.dept_id in (${deptIds})
+        </if>
         group by a.user_id,
         a.nick_name,
         a.dept_id,