fix 修改疫苗更新问题

boman-web-core/src/main/java/com/boman/web/core/controller/AdministrativeInfoController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author tjf
@@ -33,4 +34,16 @@ public class AdministrativeInfoController {
         List<AdministrativeInfo> administrativeInfos = administrativeInfoService.selectAdministrativeInfoList(administrativeInfo);
         return AjaxResult.success(administrativeInfoService.buildAdministrativeInfoTreeSelect(administrativeInfos));
     }
+
+
+    /**
+     * 获取乡镇列表,其实就是部门列表,只到村
+     */
+    @GetMapping("/treeSelectVillage")
+    public AjaxResult treeSelectVillage(AdministrativeInfo administrativeInfo)
+    {
+        List<AdministrativeInfo> administrativeInfos = administrativeInfoService.selectAdministrativeInfoList(administrativeInfo);
+        List<AdministrativeInfo> collect = administrativeInfos.stream().filter(e -> e.getAncestors().split(",").length < 3).collect(Collectors.toList());
+        return AjaxResult.success(administrativeInfoService.buildAdministrativeInfoTreeSelect(collect));
+    }
 }

boman-web-core/src/main/java/com/boman/web/core/domain/AdministrativeInfo.java

@@ -45,6 +45,10 @@ public class AdministrativeInfo extends BaseEntity {
      * 是否删除 N:未删除 Y:删除
      */
     private String isDel;
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
 
     /** 子部门 */
     private List<AdministrativeInfo> children = new ArrayList<AdministrativeInfo>();
@@ -53,6 +57,14 @@ public class AdministrativeInfo extends BaseEntity {
         return children;
     }
 
+    public String getAncestors() {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors) {
+        this.ancestors = ancestors;
+    }
+
     public void setChildren(List<AdministrativeInfo> children) {
         this.children = children;
     }

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -116,7 +116,10 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
      */
     @Override
     public List<VaccineInfoOperation> selectVaccineInfoList(VaccineInfoOperation vaccineInfoOperation) {
-        Long deptId = AuthUtils.getLoginUser().getSysUser().getDeptId();
+        Long deptId = vaccineInfoOperation.getDeptId();
+        if (deptId == null) {
+            deptId = AuthUtils.getLoginUser().getSysUser().getDeptId();
+        }
         Map<String, Object> params = vaccineInfoOperation.getParams();
         if (params != null) {
             Object age = params.get("age");

boman-web-core/src/main/resources/mapper/AdministrativeInfoMapper.xml

@@ -15,11 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
+        <result property="ancestors"    column="ancestors"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectAdministrativeInfoVo">
-        select d.id,d.parent_id, d.dept_name as  administrative_name, d.status, d.create_by, d.create_time, d.update_by, d.update_time from sys_dept d
+        select d.id,d.parent_id, d.dept_name as administrative_name,d.ancestors as ancestors , d.status, d.create_by, d.create_time, d.update_by, d.update_time from sys_dept d
     </sql>
 
     <select id="selectAdministrativeInfoList" parameterType="com.boman.web.core.domain.AdministrativeInfo" resultMap="AdministrativeInfoResult">

boman-web-core/src/main/resources/mapper/VaccineInfoMapper.xml

@@ -116,7 +116,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="manufacturer != null  and manufacturer != ''"> and vi.manufacturer = #{manufacturer}</if>
             <if test="nowIn != null  and nowIn != ''"> and vi.now_in = #{nowIn}</if>
             <if test="shouldSlow != null  and shouldSlow != ''"> and vi.should_slow = #{shouldSlow}</if>
-            <if test="deptId != null"> and vi.dept_id = #{deptId}</if>
             <if test="idCardS != null  and idCardS.size() > 0">
              and vi.id_card in
             <foreach item="idCard" collection="idCardS" open="(" separator="," close=")">