1

get-data/src/main/java/com/huimv/getdata/entity/voucher/ErpVoucher.java

@@ -9,8 +9,15 @@ import java.util.Date;
 public class ErpVoucher {
 
     private Double fcredit ;
-@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer facctorgid;
     private String  FNAME;
+
+
+    private String  yearperiod;
+    private double  endBalance;
+
+
+
 }

get-data/src/main/java/com/huimv/getdata/mapper/ErpVoucherMapper.java

@@ -29,4 +29,6 @@ public interface ErpVoucherMapper  {
     List<JingLiRunQuShi> getJingLiRunQuShi(@Param("date")String date);
 
     List<LinJinHuanKuanQi> getLinJinHuanKuan(@Param("date")String date);
+
+    List<ErpVoucher> getDangQianYueJingLiRunFuShu(@Param("date")String date);
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpVoucherServiceImpl.java

@@ -10,6 +10,7 @@ import com.huimv.getdata.service.IErpVoucherService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -39,7 +40,10 @@ public class ErpVoucherServiceImpl implements IErpVoucherService {
 
     @Override
     public List<ErpVoucher> getDangQianYueJingLiRun(String date) {
-        return  erpVoucherMapper.getDangQianYueJingLiRun(date);
+        List<ErpVoucher> dangQianYueJingLiRun = erpVoucherMapper.getDangQianYueJingLiRun(date);
+        List<ErpVoucher> dangQianYueJingLiRunFuShu = erpVoucherMapper.getDangQianYueJingLiRunFuShu(date);
+        dangQianYueJingLiRun.addAll(dangQianYueJingLiRunFuShu);
+        return dangQianYueJingLiRun;
     }
 
     @Override

get-data/src/main/resources/com/huimv/getdata/mapper/ErpVoucherMapper.xml

@@ -6,11 +6,11 @@
     <select id="getShouRuJinE" resultType="com.huimv.getdata.entity.voucher.ErpVoucher"
             parameterType="java.util.Date">
 
-        select DISTINCT  D.FCREDIT ,M.FDATE ,M.FACCTORGID  from T_GL_VOUCHER M
+        select   D.FCREDIT ,M.FDATE ,M.FACCTORGID  from T_GL_VOUCHER M
         inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID
         inner join T_BD_ACCOUNT KM ON KM.FACCTID=D.FACCOUNTID
          where
-	KM.FNumber in ('6001.01', '6001.02','6001.03')
+	KM.FNumber in ('6001.01', '6001.02','6001.03','6051.01','6051.04','6051.07','6051.09')
 	<if test="date !=null">
 	and  m.FDATE >= #{date}
 	</if>
@@ -20,23 +20,25 @@
     <select id="getDangQianYueYingYeE" resultType="com.huimv.getdata.entity.voucher.ErpVoucher"
             parameterType="java.util.Date">
 
-        select  DISTINCT D.FCREDIT ,M.FDATE ,M.FACCTORGID  from T_GL_VOUCHER M
+        select   D.FCREDIT ,M.FDATE ,M.FACCTORGID  from T_GL_VOUCHER M
 inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID
 inner join T_BD_ACCOUNT KM ON KM.FACCTID=D.FACCOUNTID
  where
-	KM.FNumber in ('6401.01.01', '6401.01.02','6401.02.01','6401.02.02','6401.02.03')
-	<if test="date !=null">
+	KM.FNumber in  ('6401.01.01', '6401.01.02','6401.02.01','6401.02.02','6401.03','6401.02.03','6401.05.01','6401.05.02','6401.05.03'
+        ,'6402.01','6402.02','6402.04','6402.09')
+        <if test="date !=null">
         and  m.FDATE >= #{date}
     </if>
     ORDER BY M.FDATE DESC
     </select>
     <select id="getDangQianYueJingLiRun" resultType="com.huimv.getdata.entity.voucher.ErpVoucher"
             parameterType="java.util.Date">
-        select DISTINCT  D.FCREDIT ,M.FDATE ,M.FACCTORGID  from T_GL_VOUCHER M
+        select   D.FCREDIT ,M.FDATE ,M.FACCTORGID  from T_GL_VOUCHER M
         inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID
         inner join T_BD_ACCOUNT KM ON KM.FACCTID=D.FACCOUNTID
          where
-	        substring(KM.FNumber,0,5) in ('6301','6703','6704','6112','6113','6101','6111')
+	        substring(KM.FNumber,0,5) in ('6001','6051','6112','6111','6101','6113', '6301')
+        and D.FCREDIT  != 0
         <if test="date !=null">
             and  m.FDATE >= #{date}
         </if>
@@ -44,14 +46,22 @@ inner join T_BD_ACCOUNT KM ON KM.FACCTID=D.FACCOUNTID
     </select>
     <select id="getDangQianZiJinYvE" resultType="com.huimv.getdata.entity.voucher.ErpVoucher"
             parameterType="java.util.Date">
-select DISTINCT  D.FCREDIT ,M.FDATE ,M.FACCTORGID ,KM.FNAME    from T_GL_VOUCHER M
-inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID
-        inner join T_BD_ACCOUNT_L KM ON KM.FACCTID=D.FACCOUNTID
+<!--select   D.FCREDIT ,M.FDATE ,M.FACCTORGID ,KM.FNAME    from T_GL_VOUCHER M-->
+<!--inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID-->
+<!--        inner join T_BD_ACCOUNT_L KM ON KM.FACCTID=D.FACCOUNTID-->
+
+<!--        <if test="date !=null">-->
+<!--           where  m.FDATE >= #{date}-->
+<!--        </if>-->
+<!--ORDER BY M.FDATE DESC-->
+
+        select  distinct  m.fyearperiod  yearperiod  ,m.FEndBalance  endBalance , d.FACCTORGID
+        from T_GL_BALANCE  m
+        inner join T_GL_VOUCHER d on d.FACCOUNTBOOKID = m.FACCOUNTBOOKID
+        inner join T_BD_ACCOUNT_L KM ON KM.FACCTID=m.FACCOUNTID  where km.fname  IN ('人民币','人民币存款','外币存款')
+        and fdetailID = 0
+
 
-        <if test="date !=null">
-           where  m.FDATE >= #{date}
-        </if>
-ORDER BY M.FDATE DESC
 
     </select>
     <select id="getDangYueJieKuanYvE" resultType="com.huimv.getdata.entity.voucher.ErpVoucher"
@@ -79,7 +89,7 @@ INNER JOIN   T_GL_VOUCHER B ON B.FVOUCHERID  = D.FVOUCHERID
     </select>
     <select id="getChanPinShouRu" resultType="com.huimv.getdata.entity.voucher.ChanPinShouRu"
             parameterType="java.util.Date">
-SELECT   DISTINCT  A.FSTOCKORGID ,  A.FDATE , C.FALLAMOUNT ,D.FNAME  FROM  T_SAL_OUTSTOCK  A
+SELECT     A.FSTOCKORGID ,  A.FDATE , C.FALLAMOUNT ,D.FNAME  FROM  T_SAL_OUTSTOCK  A
 INNER JOIN  T_SAL_OUTSTOCKENTRY B  ON A.FID= B.FID
 INNER JOIN T_SAL_OUTSTOCKENTRY_F C ON C.FENTRYID  = B.FENTRYID
 INNER JOIN T_BD_MATERIAL_L D  ON D.FMATERIALID = B.FMATERIALID
@@ -116,4 +126,16 @@ INNER JOIN t_org_organizations_l D ON D.FORGID = C.FACCTORGID
         </if>
 
     </select>
+    <select id="getDangQianYueJingLiRunFuShu" resultType="com.huimv.getdata.entity.voucher.ErpVoucher">
+        select   D.FCREDIT * -1 fcredit ,M.FDATE ,M.FACCTORGID  from T_GL_VOUCHER M
+        inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID
+        inner join T_BD_ACCOUNT KM ON KM.FACCTID=D.FACCOUNTID
+        where
+        substring(KM.FNumber,0,5) in ('6401','6402','6403','6601','6602','6605','6603', '6061','6711','6704' ,'6703' ,'6801')
+        and D.FCREDIT != 0
+        <if test="date !=null">
+            and  m.FDATE >= #{date}
+        </if>
+        ORDER BY M.FDATE DESC
+</select>
 </mapper>

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/voucher/ErpVoucher.java

@@ -13,4 +13,7 @@ public class ErpVoucher {
     private Date FDATE;
     private Integer facctorgid;
     private String FNAME;
+
+    private String  yearperiod;
+    private double  endBalance;
 }

huimv-farm/src/main/java/vip/xiaonuo/hr/modular/baseemployeeinfo/service/impl/HrBaseEmployeeInfoServiceImpl.java

@@ -307,9 +307,12 @@ public class HrBaseEmployeeInfoServiceImpl extends ServiceImpl<HrBaseEmployeeInf
             dsBusAllParam.setJobNumOnYear(calculateYOYZiJinYvE(getDouble(dsBusAllParam.getJobNum()),getDouble(lastDsBus.getJobNum( ))));
             dsBusAllParam.setJobNumIsOn(getDouble(lastDsBus.getJobNum()) <getDouble(dsBusAllParam.getJobNum()));
         }
-        DongShiCountNum dsBusAllParam = busAllParams.get(0);
-        dsBusAllParam.setJobNumOnYear("0%");
-        dsBusAllParam.setJobNumIsOn(true);
+        if (ObjectUtil.isNotEmpty(busAllParams)){
+            DongShiCountNum dsBusAllParam = busAllParams.get(0);
+            dsBusAllParam.setJobNumOnYear("0%");
+            dsBusAllParam.setJobNumIsOn(true);
+        }
+
         return busAllParams;
     }
 

huimv-farm/src/main/java/vip/xiaonuo/warehouse/controller/WarehouseAgeController.java

@@ -1,6 +1,7 @@
 package vip.xiaonuo.warehouse.controller;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
@@ -46,4 +47,5 @@ public class WarehouseAgeController {
     public CommonResult<WarehouseAge> listAge(@RequestBody WarehouseAgeParam detailParam) {
         return CommonResult.data(ageService.listAge(detailParam));
     }
+
 }

huimv-farm/src/test/java/vip/xiaonuo/CaiWuTest.java

@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.junit.Test;
@@ -89,29 +90,29 @@ public class CaiWuTest {
         }
     }
 
-    @Test
-    public void  test2(){
-        ResponseEntity<List<LinJinHuanKuanQi>> response = restTemplate.exchange(
-                "http://127.0.0.1:9200/erp-voucher/getLinJinHuanKuan?date=",
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<List<LinJinHuanKuanQi>>() {}
-        );
-        List<LinJinHuanKuanQi> forObjects = response.getBody();
-        System.out.println(forObjects);
-        for (LinJinHuanKuanQi forObject : forObjects) {
-            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getForgid()));
-            if (ObjectUtil.isEmpty(forgid))
-                continue;
-            MoneyBorrowWarning moneyBorrowWarning = new MoneyBorrowWarning();
-            moneyBorrowWarning.setOrgId(forgid.getOrgId());
-            moneyBorrowWarning.setBorrowTime(forObject.getFdate());
-            moneyBorrowWarning.setBorrowPrice(String.format("%.2f",forObject.getFcredit()));
-            moneyBorrowWarning.setMoneyType(forObject.getFname());
-            moneyBorrowWarning.setCompany(forObject.getOrgName());
-            borrowWarningMapper.insert(moneyBorrowWarning);
-        }
-    }
+//    @Test
+//    public void  test2(){
+//        ResponseEntity<List<LinJinHuanKuanQi>> response = restTemplate.exchange(
+//                "http://127.0.0.1:9200/erp-voucher/getLinJinHuanKuan?date=",
+//                HttpMethod.GET,
+//                null,
+//                new ParameterizedTypeReference<List<LinJinHuanKuanQi>>() {}
+//        );
+//        List<LinJinHuanKuanQi> forObjects = response.getBody();
+//        System.out.println(forObjects);
+//        for (LinJinHuanKuanQi forObject : forObjects) {
+//            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getForgid()));
+//            if (ObjectUtil.isEmpty(forgid))
+//                continue;
+//            MoneyBorrowWarning moneyBorrowWarning = new MoneyBorrowWarning();
+//            moneyBorrowWarning.setOrgId(forgid.getOrgId());
+//            moneyBorrowWarning.setBorrowTime(forObject.getFdate());
+//            moneyBorrowWarning.setBorrowPrice(String.format("%.2f",forObject.getFcredit()));
+//            moneyBorrowWarning.setMoneyType(forObject.getFname());
+//            moneyBorrowWarning.setCompany(forObject.getOrgName());
+//            borrowWarningMapper.insert(moneyBorrowWarning);
+//        }
+//    }
 
     @Test
     public void  test3(){
@@ -171,12 +172,16 @@ public class CaiWuTest {
                 continue;
             MoneyBusiness moneyBusiness = new MoneyBusiness();
             moneyBusiness.setOrgId(forgid.getOrgId());
-            moneyBusiness.setCreateTime(forObject.getFDATE());
-            moneyBusiness.setBalance(String.format("%.2f",forObject.getFcredit()));
+            String yearperiod = forObject.getYearperiod();
+
+            moneyBusiness.setCreateTime( DateUtil.parse(yearperiod,"yyyyMM"));
+            moneyBusiness.setBalance(String.format("%.2f",forObject.getEndBalance()));
             businessMapper.insert(moneyBusiness);
         }
     }
 
+
+
     @Test
     public void  test6(){
         ResponseEntity<List<ChanPinShouRu>> response = restTemplate.exchange(

snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java

@@ -244,6 +244,9 @@ public class AuthServiceImpl implements AuthService {
             if(ObjectUtil.isEmpty(saBaseLoginUser)) {
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_ERROR.getValue());
             }
+            if(saBaseLoginUser.getAccountType() == 2){
+                authAccountPasswordLoginParam.setAccountType(2);
+            }
             if ( !saBaseLoginUser.getAccountType().equals(authAccountPasswordLoginParam.getAccountType())){
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_TYPE_ERROR.getValue());
             }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/controller/BizUserController.java

@@ -17,6 +17,8 @@ import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.biz.modular.org.entity.BizOrg;
 import vip.xiaonuo.biz.modular.user.param.*;
 import vip.xiaonuo.biz.modular.user.param.*;
@@ -84,6 +86,7 @@ public class BizUserController {
     @SaCheckPermission("/biz/user/add")
     @PostMapping("/biz/user/add")
     public CommonResult<String> add(@RequestBody @Valid BizUserAddParam bizUserAddParam) {
+        bizUserAddParam.setPositionId(bizUserAddParam.getAccountType()+"");
         bizUserService.add(bizUserAddParam);
         return CommonResult.ok();
     }
@@ -135,6 +138,14 @@ public class BizUserController {
         return CommonResult.data(bizUserService.detail(bizUserIdParam));
     }
 
+
+
+//    @GetMapping("/biz/user/getAccountType")
+//    public CommonResult<BizUser> detail() {
+//        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
+//        Integer accountType = loginUser.getAccountType();
+////        return CommonResult.data();
+//    }
     /**
      * 禁用人员
      *

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/entity/BizUser.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fhs.core.trans.anno.Trans;
 import com.fhs.core.trans.constant.TransType;
 import com.fhs.core.trans.vo.TransPojo;
+import io.swagger.models.auth.In;
 import vip.xiaonuo.biz.modular.org.entity.BizOrg;
 import vip.xiaonuo.biz.modular.position.entity.BizPosition;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +59,8 @@ public class BizUser extends CommonEntity implements TransPojo {
     /** 账号 */
     @ApiModelProperty(value = "账号", position = 4)
     private String account;
+    @ApiModelProperty(value = "账号", position = 4)
+    private Integer accountType;
 
     /** 密码 */
     @ApiModelProperty(value = "密码", position = 5)
@@ -199,6 +202,8 @@ public class BizUser extends CommonEntity implements TransPojo {
     @Trans(type = TransType.SIMPLE, target = BizOrg.class, fields = "name", alias = "org", ref = "orgName")
     private String orgId;
 
+    private String orgIds;
+
     /** 岗位id */
     @ApiModelProperty(value = "岗位id", position = 33)
     @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserAddParam.java

@@ -33,6 +33,7 @@ public class BizUserAddParam {
     @NotBlank(message = "account不能为空")
     private String account;
 
+    private Integer accountType;
     /** 姓名 */
     @ApiModelProperty(value = "姓名", required = true, position = 2)
     @NotBlank(message = "name不能为空")
@@ -43,9 +44,12 @@ public class BizUserAddParam {
     @NotBlank(message = "orgId不能为空")
     private String orgId;
 
+    @ApiModelProperty(value = "机构id", required = true, position = 3)
+    private String orgIds;
+
     /** 岗位id */
     @ApiModelProperty(value = "岗位id", required = true, position = 4)
-    @NotBlank(message = "positionId不能为空")
+//    @NotBlank(message = "positionId不能为空")
     private String positionId;
 
     /** 岗级 */

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserEditParam.java

@@ -37,12 +37,14 @@ public class BizUserEditParam {
     @ApiModelProperty(value = "账号", required = true, position = 2)
     @NotBlank(message = "account不能为空")
     private String account;
+    private Integer accountType;
 
     /** 姓名 */
     @ApiModelProperty(value = "姓名", required = true, position = 3)
     @NotBlank(message = "name不能为空")
     private String name;
 
+    private String orgIds;
     /** 机构id */
     @ApiModelProperty(value = "机构id", required = true, position = 4)
     @NotBlank(message = "orgId不能为空")
@@ -50,7 +52,6 @@ public class BizUserEditParam {
 
     /** 岗位id */
     @ApiModelProperty(value = "岗位id", required = true, position = 5)
-    @NotBlank(message = "positionId不能为空")
     private String positionId;
 
     /** 岗级 */

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java

@@ -47,6 +47,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fhs.trans.service.impl.TransService;
+import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.biz.core.enums.BizBuildInEnum;
 import vip.xiaonuo.biz.core.enums.BizDataTypeEnum;
@@ -143,7 +144,9 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
         // 校验数据范围
         List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
         if(ObjectUtil.isNotEmpty(loginUserDataScope)) {
-            queryWrapper.lambda().in(BizUser::getOrgId, loginUserDataScope);
+            SaBaseLoginUser saBaseLoginUser = StpLoginUserUtil.getLoginUser();
+            //
+            queryWrapper.lambda().in(BizUser::getOrgId, loginUserDataScope).eq(BizUser::getCreateUser , saBaseLoginUser.getId());
         } else {
             queryWrapper.lambda().eq(BizUser::getId, StpUtil.getLoginIdAsString());
         }
@@ -155,6 +158,7 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
     public void add(BizUserAddParam bizUserAddParam) {
         checkParam(bizUserAddParam);
         BizUser bizUser = BeanUtil.toBean(bizUserAddParam, BizUser.class);
+        bizUser.setPositionId(bizUserAddParam.getAccountType()+"");
         if(ObjectUtil.isEmpty(bizUser.getAvatar())) {
             // 设置默认头像
             bizUser.setAvatar(CommonAvatarUtil.generateImg(bizUser.getName()));
@@ -207,6 +211,7 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
     @Override
     public void edit(BizUserEditParam bizUserEditParam) {
         BizUser bizUser = this.queryEntity(bizUserEditParam.getId());
+        bizUser.setPositionId(bizUserEditParam.getAccountType()+"");
         checkParam(bizUserEditParam);
         boolean updateSuperAdminAccount = bizUser.getAccount().equals(BizBuildInEnum.BUILD_IN_USER_ACCOUNT.getValue()) &&
                 !bizUserEditParam.getAccount().equals(BizBuildInEnum.BUILD_IN_USER_ACCOUNT.getValue());
@@ -214,6 +219,7 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
             throw new CommonException("不可修改系统内置超管人员账号");
         }
         BeanUtil.copyProperties(bizUserEditParam, bizUser);
+        bizUser.setPositionId(bizUserEditParam.getAccountType()+"");
         this.updateById(bizUser);
 
         // 发布更新事件

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java

@@ -197,15 +197,20 @@ public class SysOrgController {
         if (ObjectUtil.isNotEmpty(orgIds)){
             String[] split = orgIds.split(",");
             List<SysOrg> sysOrgs = sysOrgService.list(new QueryWrapper<SysOrg>().in("ID",split ));
-//            jsonObject.put("name", "全部");
-//            jsonObject.put("id", "");
-//            jsonArray.add(jsonObject);
+            if (sysOrgs.size()>2){
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", "全部");
+                jsonObject.put("id", "");
+                jsonArray.add(jsonObject);
+            }
             for (SysOrg org : sysOrgs) {
                 JSONObject jsonObject1 = new JSONObject();
                 jsonObject1.put("name", org.getName());
                 jsonObject1.put("id", org.getId());
                 jsonArray.add(jsonObject1);
             }
+
+
             return CommonResult.data(jsonArray);
         }