集团权限设置公共方法

yijia-system/src/main/java/com/yijia/system/service/impl/SysDeptServiceImpl.java

@@ -341,14 +341,19 @@ public class SysDeptServiceImpl implements ISysDeptService
                     list.add(dpt2.getDeptId().toString());
                 }
             }
-
         }else if(dept!=null && dept.getJiBie()!=null  && dept.getJiBie()==2){
             SysDept sysDept  = deptMapper.selectDeptById(dept.getParentId());
-            if(sysDept.getIntegralRuleFlag()!=null &&sysDept.getIntegralRuleFlag().equals("1")){
-                list.add(sysDept.getDeptId()+"");
-            }else if(sysDept.getIntegralRuleFlag()!=null &&sysDept.getIntegralRuleFlag().equals("0")){
+            if(sysDept.getCouponFlag()!=null &&sysDept.getCouponFlag().equals("1")){
+                list.add(sysDept.getDeptId().toString());
+            }else if(sysDept.getCouponFlag()!=null &&sysDept.getCouponFlag().equals("0")){
                 list.add(dept.getDeptId()+"");
             }
+        }else if(dept!=null && dept.getJiBie()!=null  && dept.getJiBie()==0) {
+            SysDept sysDept =new SysDept();
+            List<SysDept> list2 = deptMapper.selectDeptList(sysDept);
+            for(SysDept dpt2:list2){
+                list.add(dpt2.getDeptId().toString());
+            }
         }
         return list;
     }
@@ -369,14 +374,19 @@ public class SysDeptServiceImpl implements ISysDeptService
                     list.add(dpt2.getDeptId().toString());
                 }
             }
-
         }else if(dept!=null && dept.getJiBie()!=null  && dept.getJiBie()==2){
             SysDept sysDept  = deptMapper.selectDeptById(dept.getParentId());
             if(sysDept.getCardRuleFlag()!=null &&sysDept.getCardRuleFlag().equals("1")){
-                list.add(sysDept.getDeptId()+"");
+                list.add(sysDept.getDeptId().toString());
             }else if(sysDept.getCardRuleFlag()!=null &&sysDept.getCardRuleFlag().equals("0")){
                 list.add(dept.getDeptId()+"");
             }
+        }else if(dept!=null && dept.getJiBie()!=null  && dept.getJiBie()==0) {
+            SysDept sysDept =new SysDept();
+            List<SysDept> list2 = deptMapper.selectDeptList(sysDept);
+            for(SysDept dpt2:list2){
+                list.add(dpt2.getDeptId().toString());
+            }
         }
         return list;
     }
@@ -400,14 +410,19 @@ public class SysDeptServiceImpl implements ISysDeptService
                     list.add(dpt2.getDeptId().toString());
                 }
             }
-
         }else if(dept!=null && dept.getJiBie()!=null  && dept.getJiBie()==2){
             SysDept sysDept  = deptMapper.selectDeptById(dept.getParentId());
             if(sysDept.getCouponFlag()!=null &&sysDept.getCouponFlag().equals("1")){
-                list.add(sysDept.getDeptId()+"");
+                list.add(sysDept.getDeptId().toString());
             }else if(sysDept.getCouponFlag()!=null &&sysDept.getCouponFlag().equals("0")){
                 list.add(dept.getDeptId()+"");
             }
+        }else if(dept!=null && dept.getJiBie()!=null  && dept.getJiBie()==0) {
+            SysDept sysDept =new SysDept();
+            List<SysDept> list2 = deptMapper.selectDeptList(sysDept);
+            for(SysDept dpt2:list2){
+                list.add(dpt2.getDeptId().toString());
+            }
         }
         return list;
     }