fix 修改疫苗权限查询

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

@@ -159,7 +159,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
             }
             List<SysDept> sysDepts = remoteDeptService.listChildrenDepts(deptId);
             List<Long> deptIdList = new ArrayList<>();
-            if(sysDepts != null && sysDepts.size() > 0){
+            if (sysDepts != null && sysDepts.size() > 0) {
                 for (SysDept sysDept : sysDepts) {
                     Long id = sysDept.getId();
                     deptIdList.add(id);
@@ -382,22 +382,22 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
                     String deptName = sysDept.getDeptName();
                     if (village.equals(deptName)) {
                         if (StringUtils.isNotBlank(villagerGroup)) {
-                                for (SysDept child : sysDepts) {
-                                    String deptNameChild = child.getDeptName();
-                                    if (villagerGroup.equals(deptNameChild)) {
-                                        deptId = child.getId();
-                                        return deptId;
-                                    }
+                            for (SysDept child : sysDepts) {
+                                String deptNameChild = child.getDeptName();
+                                if (villagerGroup.equals(deptNameChild)) {
+                                    deptId = child.getId();
+                                    return deptId;
                                 }
+                            }
 
-                        }else {
+                        } else {
                             deptId = sysDept.getId();
                         }
                     }
                 }
-            }else {
+            } else {
                 for (SysDept sysDept : sysDepts) {
-                    if (villageTowns.equals(sysDept.getDeptName())){
+                    if (villageTowns.equals(sysDept.getDeptName())) {
                         deptId = sysDept.getId();
                     }
                 }
@@ -981,7 +981,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
     @Override
     public List<JSONObject> list() {
         String deptName = AuthUtils.getLoginUser().getSysUser().getDept().getDeptName();
-        if("潜山市".equals(deptName)){
+        if ("潜山市".equals(deptName)) {
             return standardlyMapper.list();
         }
 

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

@@ -83,11 +83,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         vi.is_del,vi.code,vi.birthday,vi.work_unit,vi.crowd_classification,vi.manufacturer,vi.now_in,vi.url,vi.dept_id from vaccine_info vi
         <where>
             vi.is_del = 'N'
-         <!--   <if test="villageTowns != null  and villageTowns != ''">
+            <if test="villageTowns != null  and villageTowns != ''">
                 and vi.village_towns = #{villageTowns}
             </if>
             <if test="village != null  and village != ''"> and vi.village = #{village}</if>
-            <if test="villagerGroup != null  and villagerGroup != ''"> and vi.villager_group = #{villagerGroup}</if>-->
+            <if test="villagerGroup != null  and villagerGroup != ''"> and vi.villager_group = #{villagerGroup}</if>
             <if test="houseType != null  and houseType != ''"> and vi.house_type = #{houseType}</if>
             <if test="domicile != null  and domicile != ''"> and vi.domicile = #{domicile}</if>
             <if test="province != null  and province != ''"> and vi.province = #{province}</if>