'commit'

src/main/java/com/dsideal/QingLong/Organization/Controller/OrganizationController.java

@@ -64,7 +64,7 @@ public class OrganizationController extends Controller {
     //是不是有权限操作这个单位或区域下的数据？
     @LengthInterface({"org_name,2,64"})
     public void addBureau(String org_code, String org_name, String parent_org_id, int org_type_id,
-                          int school_type_id, int sort_id, String property_id, int level_id) {
+                          int school_type_id, int sort_id, String property_id, int level_id,int is_virtual) {
         String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
         if (org_code.trim().equals("-1")) {
             renderJson(CommonUtil.returnMessageJson(false, "-1是保留字，不能做为编码使用！"));
@@ -109,7 +109,7 @@ public class OrganizationController extends Controller {
         //客户端ip_address
         String ip_address = IpUtil.getIpAddr(getRequest());
         model.addBureau(org_code, org_name, parent_org_id, org_type_id, school_type_id,
-                sort_id, operator, ip_address, property_id, level_id);
+                sort_id, operator, ip_address, property_id, level_id,is_virtual);
         renderJson(CommonUtil.returnMessageJson(true, "保存成功!"));
     }
 
@@ -130,7 +130,7 @@ public class OrganizationController extends Controller {
     @IsSysAdminInterface({"1", "2", "3"}) //是不是1，2，3号管理员
     //是不是有权限操作这个单位或区域下的数据？
     @LengthInterface({"bureau_name,2,64"})
-    public void updateBureau(String bureau_id, String org_code, String bureau_name, String parent_org_id, int sort_id, String main_school_id, int property_id) {
+    public void updateBureau(String bureau_id, String org_code, String bureau_name, String parent_org_id, int sort_id, String main_school_id, int property_id,int is_virtual) {
         if (model.getOrgCodeCountExceptSelf(bureau_id, org_code) > 0) {
             renderJson(CommonUtil.returnMessageJson(false, "此单位代码已存在，不能添加！"));
             return;
@@ -139,7 +139,7 @@ public class OrganizationController extends Controller {
         String operator = SessionKit.get(getRequest(), getResponse(), "person_id");
         //客户端ip_address
         String ip_address = IpUtil.getIpAddr(getRequest());
-        model.updateBureau(bureau_id, org_code, bureau_name, parent_org_id, sort_id, main_school_id, property_id, operator, ip_address);
+        model.updateBureau(bureau_id, org_code, bureau_name, parent_org_id, sort_id, main_school_id, property_id, operator, ip_address,is_virtual);
         renderJson(CommonUtil.returnMessageJson(true, "修改成功!"));
     }
 

src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java

@@ -106,7 +106,8 @@ public class OrganizationModel {
      * 作者：黄海
      * 时间： 2018-11-29
      */
-    public void addBureau(String org_code, String org_name, String parent_org_id, int org_type_id, int school_type_id, int sort_id, String operator, String ip_address, String property_id, int level_id) {
+    public void addBureau(String org_code, String org_name, String parent_org_id, int org_type_id, int school_type_id, int sort_id, String operator,
+                          String ip_address, String property_id, int level_id,int is_virtual) {
         //默认的身份证号
         String NullIdCardCode = "000000000000000000";
         String city_id;
@@ -145,6 +146,7 @@ public class OrganizationModel {
         record.set("property_id", property_id);
         record.set("level_id", level_id);
         record.set("update_ts", DateTime.now());
+        record.set("is_virtual",is_virtual);
         Db.save("t_base_organization", "org_id", record);
 
         //添加登录人员信息(单位管理员)
@@ -260,7 +262,7 @@ public class OrganizationModel {
      * 作者：黄海
      * 时间： 2018-11-29
      */
-    public void updateBureau(String org_id, String org_code, String org_name, String parent_org_id, int sort_id, String main_school_id, int property_id, String operator, String ip_address) {
+    public void updateBureau(String org_id, String org_code, String org_name, String parent_org_id, int sort_id, String main_school_id, int property_id, String operator, String ip_address,int is_virtual) {
         Record record = Db.findById("t_base_organization", "org_id", org_id);
         record.set("org_id", org_id);
         record.set("org_code", org_code);
@@ -286,6 +288,7 @@ public class OrganizationModel {
         record.set("create_time", create_time);
         record.set("b_use", b_use);
         record.remove("update_ts");
+        record.set("is_virtual",is_virtual);
         Db.update("t_base_organization", "org_id", record);
     }