ibizdev提交

PSDETOOLBARS/Auto5_5260/PSDETOOLBAR.json

+{
+  "templtoolbar" : 1,
+  "psdetoolbarname" : "工具栏模板（编辑界面_保存、关闭、拷贝）",
+  "pssystoolbarid" : "TBTEMPL_00001",
+  "codename" : "Auto5_5260",
+  "psdetbitems" : [ {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem1",
+    "psdeuiactionid" : "VIEW_DEBHGROUP001",
+    "spanflag" : 0,
+    "tbitemtype" : "DEUIACTION"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem2",
+    "spanflag" : 0,
+    "tbitemtype" : "SEPERATOR",
+    "caption" : "-"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem3",
+    "psdeuiactionid" : "EDITVIEW_SAVEACTION(Save)",
+    "spanflag" : 0,
+    "tbitemtype" : "DEUIACTION"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem6",
+    "spanflag" : 0,
+    "tbitemtype" : "SEPERATOR",
+    "caption" : "-"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "deuiaction2",
+    "psdeuiactionid" : "EDITVIEW_EXITACTION(Exit)",
+    "spanflag" : 0,
+    "tbitemtype" : "DEUIACTION"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem11",
+    "spanflag" : 0,
+    "tbitemtype" : "SEPERATOR",
+    "caption" : "-"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem14",
+    "psdeuiactionid" : "EDITVIEW_COPYACTION(Copy)",
+    "spanflag" : 0,
+    "tbitemtype" : "DEUIACTION"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem16",
+    "spanflag" : 0,
+    "tbitemtype" : "SEPERATOR",
+    "caption" : "-"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem17",
+    "psdeuiactionid" : "VIEW_DEBHGROUP002",
+    "spanflag" : 0,
+    "tbitemtype" : "DEUIACTION"
+  }, {
+    "hiddenitem" : 0,
+    "psdetbitemname" : "tbitem18",
+    "spanflag" : 0,
+    "tbitemtype" : "ITEMS",
+    "caption" : "其它",
+    "psdetbitems" : [ {
+      "hiddenitem" : 0,
+      "psdetoolbarid" : "<PSDETOOLBAR>",
+      "psdetbitemname" : "tbitem19",
+      "psdeuiactionid" : "VIEW_DEBHGROUP003",
+      "spanflag" : 0,
+      "tbitemtype" : "DEUIACTION"
+    } ]
+  } ]
+}
\ No newline at end of file

PSMODULES/ou/PSDATAENTITIES/SYS_DEPT/PSDATAENTITY.json

@@ -714,6 +714,50 @@
       "customdatatype" : 0,
       "dbtype" : "POSTGRESQL"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "ISVALID",
+    "psdatatypename" : "是否逻辑",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "IsValid",
+    "psdatatypeid" : "YESNO",
+    "defaultvalue" : "1",
+    "pkey" : 0,
+    "logicname" : "启用标识",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "tablename" : "IBZDEPT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[ISVALID][启用标识]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[ISVALID][启用标识]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "psdefsfitemname" : "N_ISVALID_EQ"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "ISVALID",
+      "customdatatype" : 0,
+      "dbtype" : "ORACLE"
+    }, {
+      "psdefdtcolname" : "ISVALID",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    }, {
+      "psdefdtcolname" : "ISVALID",
+      "customdatatype" : 0,
+      "dbtype" : "POSTGRESQL"
+    } ]
   } ],
   "psdeopprivs" : [ {
     "logicname" : "建立",

PSMODULES/ou/PSDATAENTITIES/SYS_DEPT/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`BCODE`,\nt1.`CREATEDATE`,\nt1.`DEPTCODE`,\nt1.`DEPTID`,\nt1.`DEPTLEVEL`,\nt1.`DEPTNAME`,\nt1.`DOMAINS`,\nt1.`ENABLE`,\nt1.`LEADERID`,\nt1.`LEADERNAME`,\nt1.`ORGID`,\nt11.`ORGNAME`,\nt1.`PDEPTID`,\nt21.`DEPTNAME` AS `PDEPTNAME`,\nt1.`SHORTNAME`,\nt1.`SHOWORDER`,\nt1.`UPDATEDATE`\nFROM `IBZDEPT` t1 \nLEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID \nLEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID \n",
+  "querycode" : "SELECT\nt1.`BCODE`,\nt1.`CREATEDATE`,\nt1.`DEPTCODE`,\nt1.`DEPTID`,\nt1.`DEPTLEVEL`,\nt1.`DEPTNAME`,\nt1.`DOMAINS`,\nt1.`ENABLE`,\nt1.`ISVALID`,\nt1.`LEADERID`,\nt1.`LEADERNAME`,\nt1.`ORGID`,\nt11.`ORGNAME`,\nt1.`PDEPTID`,\nt21.`DEPTNAME` AS `PDEPTNAME`,\nt1.`SHORTNAME`,\nt1.`SHOWORDER`,\nt1.`UPDATEDATE`\nFROM `IBZDEPT` t1 \nLEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID \nLEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -35,40 +35,44 @@
     "ordervalue" : 7,
     "psdedqcodeexpname" : "ENABLE"
   }, {
-    "expcode" : "t1.`LEADERID`",
+    "expcode" : "t1.`ISVALID`",
     "ordervalue" : 8,
+    "psdedqcodeexpname" : "ISVALID"
+  }, {
+    "expcode" : "t1.`LEADERID`",
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "LEADERID"
   }, {
     "expcode" : "t1.`LEADERNAME`",
-    "ordervalue" : 9,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "LEADERNAME"
   }, {
     "expcode" : "t1.`ORGID`",
-    "ordervalue" : 10,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "ORGID"
   }, {
     "expcode" : "t11.`ORGNAME`",
-    "ordervalue" : 11,
+    "ordervalue" : 12,
     "psdedqcodeexpname" : "ORGNAME"
   }, {
     "expcode" : "t1.`PDEPTID`",
-    "ordervalue" : 12,
+    "ordervalue" : 13,
     "psdedqcodeexpname" : "PDEPTID"
   }, {
     "expcode" : "t21.`DEPTNAME`",
-    "ordervalue" : 13,
+    "ordervalue" : 14,
     "psdedqcodeexpname" : "PDEPTNAME"
   }, {
     "expcode" : "t1.`SHORTNAME`",
-    "ordervalue" : 14,
+    "ordervalue" : 15,
     "psdedqcodeexpname" : "SHORTNAME"
   }, {
     "expcode" : "t1.`SHOWORDER`",
-    "ordervalue" : 15,
+    "ordervalue" : 16,
     "psdedqcodeexpname" : "SHOWORDER"
   }, {
     "expcode" : "t1.`UPDATEDATE`",
-    "ordervalue" : 16,
+    "ordervalue" : 17,
     "psdedqcodeexpname" : "UPDATEDATE"
   } ],
   "psdedqcodeconds" : [ {

PSMODULES/ou/PSDATAENTITIES/SYS_DEPT/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`BCODE`,\nt1.`CREATEDATE`,\nt1.`DEPTCODE`,\nt1.`DEPTID`,\nt1.`DEPTLEVEL`,\nt1.`DEPTNAME`,\nt1.`DOMAINS`,\nt1.`ENABLE`,\nt1.`LEADERID`,\nt1.`LEADERNAME`,\nt1.`ORGID`,\nt11.`ORGNAME`,\nt1.`PDEPTID`,\nt21.`DEPTNAME` AS `PDEPTNAME`,\nt1.`SHORTNAME`,\nt1.`SHOWORDER`,\nt1.`UPDATEDATE`\nFROM `IBZDEPT` t1 \nLEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID \nLEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID \n",
+  "querycode" : "SELECT\nt1.`BCODE`,\nt1.`CREATEDATE`,\nt1.`DEPTCODE`,\nt1.`DEPTID`,\nt1.`DEPTLEVEL`,\nt1.`DEPTNAME`,\nt1.`DOMAINS`,\nt1.`ENABLE`,\nt1.`ISVALID`,\nt1.`LEADERID`,\nt1.`LEADERNAME`,\nt1.`ORGID`,\nt11.`ORGNAME`,\nt1.`PDEPTID`,\nt21.`DEPTNAME` AS `PDEPTNAME`,\nt1.`SHORTNAME`,\nt1.`SHOWORDER`,\nt1.`UPDATEDATE`\nFROM `IBZDEPT` t1 \nLEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID \nLEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -35,40 +35,44 @@
     "ordervalue" : 7,
     "psdedqcodeexpname" : "ENABLE"
   }, {
-    "expcode" : "t1.`LEADERID`",
+    "expcode" : "t1.`ISVALID`",
     "ordervalue" : 8,
+    "psdedqcodeexpname" : "ISVALID"
+  }, {
+    "expcode" : "t1.`LEADERID`",
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "LEADERID"
   }, {
     "expcode" : "t1.`LEADERNAME`",
-    "ordervalue" : 9,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "LEADERNAME"
   }, {
     "expcode" : "t1.`ORGID`",
-    "ordervalue" : 10,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "ORGID"
   }, {
     "expcode" : "t11.`ORGNAME`",
-    "ordervalue" : 11,
+    "ordervalue" : 12,
     "psdedqcodeexpname" : "ORGNAME"
   }, {
     "expcode" : "t1.`PDEPTID`",
-    "ordervalue" : 12,
+    "ordervalue" : 13,
     "psdedqcodeexpname" : "PDEPTID"
   }, {
     "expcode" : "t21.`DEPTNAME`",
-    "ordervalue" : 13,
+    "ordervalue" : 14,
     "psdedqcodeexpname" : "PDEPTNAME"
   }, {
     "expcode" : "t1.`SHORTNAME`",
-    "ordervalue" : 14,
+    "ordervalue" : 15,
     "psdedqcodeexpname" : "SHORTNAME"
   }, {
     "expcode" : "t1.`SHOWORDER`",
-    "ordervalue" : 15,
+    "ordervalue" : 16,
     "psdedqcodeexpname" : "SHOWORDER"
   }, {
     "expcode" : "t1.`UPDATEDATE`",
-    "ordervalue" : 16,
+    "ordervalue" : 17,
     "psdedqcodeexpname" : "UPDATEDATE"
   } ],
   "psdedqcodeconds" : [ {

PSMODULES/ou/PSDATAENTITIES/SYS_DEPT/PSDEFORMS/Main/PSDEFORM.json

@@ -127,6 +127,14 @@
       "psdeformid" : "<PSDEFORM>",
       "updatedv" : "1",
       "createdv" : "1"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/ISVALID",
+      "caption" : "启用",
+      "psdeformdetailname" : "isvalid",
+      "psdefname" : "isvalid",
+      "detailtype" : "FORMITEM",
+      "logicname" : "启用标识",
+      "psdeformid" : "<PSDEFORM>"
     }, {
       "psdefid" : "<PSDATAENTITY>/CREATEDATE",
       "psdeformdetailname" : "createdate",

PSMODULES/ou/PSDATAENTITIES/SYS_DEPT/PSDEGRIDS/Main/PSDEGRID.json

@@ -72,6 +72,14 @@
     "width" : 250,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
+  }, {
+    "psdefname" : "isvalid",
+    "psdefid" : "<PSDATAENTITY>/ISVALID",
+    "logicname" : "启用标识",
+    "psdegridcolname" : "isvalid",
+    "caption" : "启用",
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
   }, {
     "psdefname" : "SHOWORDER",
     "psdefid" : "<PSDATAENTITY>/SHOWORDER",

PSMODULES/ou/PSDATAENTITIES/SYS_EMP/PSDEFORMS/Default/PSDEFORM.json

@@ -11,10 +11,11 @@
     "detailtype" : "FORMPAGE",
     "child_col_sm" : 12,
     "cappslanresid" : "Auto226",
-    "child_col_md" : 12,
+    "child_col_md" : 6,
     "colmodel" : "33%;33%;34%",
-    "child_col_lg" : 8,
+    "child_col_lg" : 6,
     "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.SYS_EMP.DEFAULT.FORMPAGE.FORMPAGE1]",
+    "layoutmode" : "TABLE_24COL",
     "psdeformdetails" : [ {
       "psdefid" : "<PSDATAENTITY>/USERCODE",
       "psdefsfitemname" : "N_USERCODE_LIKE",
@@ -45,6 +46,16 @@
       "logicname" : "主部门名称[文本包含(%)]",
       "psdeformid" : "<PSDEFORM>",
       "psdefsfitemid" : "<PSDATAENTITY>/MDEPTNAME/N_MDEPTNAME_LIKE"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/POSTNAME",
+      "psdefsfitemname" : "N_POSTNAME_LIKE",
+      "caption" : "岗位",
+      "psdeformdetailname" : "n_postname_like",
+      "psdefname" : "postname",
+      "detailtype" : "FORMITEM",
+      "logicname" : "岗位名称[文本包含(%)]",
+      "psdeformid" : "<PSDEFORM>",
+      "psdefsfitemid" : "<PSDATAENTITY>/POSTNAME/N_POSTNAME_LIKE"
     } ]
   } ]
 }
\ No newline at end of file

PSMODULES/ou/PSDATAENTITIES/SYS_EMP/PSDEFORMS/Main/PSDEFORM.json

@@ -157,6 +157,27 @@
         "detailtype" : "FORMITEM",
         "logicname" : "业务编码",
         "psdeformid" : "<PSDEFORM>"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/POSTNAME",
+        "psdeformdetailname" : "postname",
+        "psdefname" : "postname",
+        "detailtype" : "FORMITEM",
+        "logicname" : "岗位名称",
+        "psdeformid" : "<PSDEFORM>"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/POSTCODE",
+        "psdeformdetailname" : "postcode",
+        "psdefname" : "postcode",
+        "detailtype" : "FORMITEM",
+        "logicname" : "岗位代码",
+        "psdeformid" : "<PSDEFORM>"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/POSTID",
+        "psdeformdetailname" : "postid",
+        "psdefname" : "postid",
+        "detailtype" : "FORMITEM",
+        "logicname" : "岗位标识",
+        "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/NICKNAME",
         "psdeformdetailname" : "nickname",

PSMODULES/ou/PSDATAENTITIES/SYS_EMP/PSDEGRIDS/EditGrid/PSDEGRID.json

@@ -73,6 +73,22 @@
     "width" : 150,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
+  }, {
+    "psdefname" : "postcode",
+    "psdefid" : "<PSDATAENTITY>/POSTCODE",
+    "logicname" : "岗位代码",
+    "psdegridcolname" : "postcode",
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
+  }, {
+    "psdefname" : "postname",
+    "psdefid" : "<PSDATAENTITY>/POSTNAME",
+    "logicname" : "岗位名称",
+    "psdegridcolname" : "postname",
+    "enablerowedit" : 1,
+    "width" : 200,
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
   }, {
     "psdefname" : "SEX",
     "psdefid" : "<PSDATAENTITY>/SEX",

PSMODULES/ou/PSDATAENTITIES/SYS_EMP/PSDEGRIDS/Main/PSDEGRID.json

@@ -65,7 +65,23 @@
     "logicname" : "主部门名称",
     "psdegridcolname" : "mdeptname",
     "widthunit" : "px",
-    "width" : 150,
+    "width" : 200,
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
+  }, {
+    "psdefname" : "postcode",
+    "psdefid" : "<PSDATAENTITY>/POSTCODE",
+    "logicname" : "岗位代码",
+    "psdegridcolname" : "postcode",
+    "width" : 200,
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
+  }, {
+    "psdefname" : "postname",
+    "psdefid" : "<PSDATAENTITY>/POSTNAME",
+    "logicname" : "岗位名称",
+    "psdegridcolname" : "postname",
+    "width" : 200,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
   }, {

PSMODULES/ou/PSDATAENTITIES/SYS_EMP/PSDELOGICS/saveDeptMember/PSDELOGIC.json

@@ -47,6 +47,7 @@
       "srcpsdlparamid" : "<PSDELOGIC>/Default",
       "srcpsdlparamname" : "Default",
       "psdelnparamname" : "Default[MDEPTID] ==> member[DEPTID]",
+      "psdelogicid" : "ce0d0ff1776568ee1d4aa9b085a05300",
       "dstpsdlparamid" : "<PSDELOGIC>/member",
       "customsrcparam" : "MDEPTID",
       "customdstparam" : "DEPTID",
@@ -58,6 +59,7 @@
       "srcpsdlparamid" : "<PSDELOGIC>/Default",
       "srcpsdlparamname" : "Default",
       "psdelnparamname" : "Default[USERID] ==> member[USERID]",
+      "psdelogicid" : "ce0d0ff1776568ee1d4aa9b085a05300",
       "dstpsdlparamid" : "<PSDELOGIC>/member",
       "customsrcparam" : "USERID",
       "customdstparam" : "USERID",

PSMODULES/ou/PSDATAENTITIES/SYS_ORG/PSDATAENTITY.json

@@ -582,6 +582,50 @@
       "customdatatype" : 0,
       "dbtype" : "ORACLE"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "ISVALID",
+    "psdatatypename" : "是否逻辑",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "IsValid",
+    "psdatatypeid" : "YESNO",
+    "defaultvalue" : "1",
+    "pkey" : 0,
+    "logicname" : "启用标识",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "tablename" : "IBZORG",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[ISVALID][启用标识]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[ISVALID][启用标识]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "psdefsfitemname" : "N_ISVALID_EQ"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "ISVALID",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    }, {
+      "psdefdtcolname" : "ISVALID",
+      "customdatatype" : 0,
+      "dbtype" : "POSTGRESQL"
+    }, {
+      "psdefdtcolname" : "ISVALID",
+      "customdatatype" : 0,
+      "dbtype" : "ORACLE"
+    } ]
   } ],
   "psdeopprivs" : [ {
     "logicname" : "建立",

PSMODULES/ou/PSDATAENTITIES/SYS_ORG/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`CREATEDATE`,\nt1.`DOMAINS`,\nt1.`ENABLE`,\nt1.`ORGCODE`,\nt1.`ORGID`,\nt1.`ORGLEVEL`,\nt1.`ORGNAME`,\nt1.`PORGID`,\nt11.`ORGNAME` AS `PORGNAME`,\nt1.`SHORTNAME`,\nt1.`SHOWORDER`,\nt1.`UPDATEDATE`\nFROM `IBZORG` t1 \nLEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID \n",
+  "querycode" : "SELECT\nt1.`CREATEDATE`,\nt1.`DOMAINS`,\nt1.`ENABLE`,\nt1.`ISVALID`,\nt1.`ORGCODE`,\nt1.`ORGID`,\nt1.`ORGLEVEL`,\nt1.`ORGNAME`,\nt1.`PORGID`,\nt11.`ORGNAME` AS `PORGNAME`,\nt1.`SHORTNAME`,\nt1.`SHOWORDER`,\nt1.`UPDATEDATE`\nFROM `IBZORG` t1 \nLEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -15,40 +15,44 @@
     "ordervalue" : 2,
     "psdedqcodeexpname" : "ENABLE"
   }, {
-    "expcode" : "t1.`ORGCODE`",
+    "expcode" : "t1.`ISVALID`",
     "ordervalue" : 3,
+    "psdedqcodeexpname" : "ISVALID"
+  }, {
+    "expcode" : "t1.`ORGCODE`",
+    "ordervalue" : 4,
     "psdedqcodeexpname" : "ORGCODE"
   }, {
     "expcode" : "t1.`ORGID`",
-    "ordervalue" : 4,
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "ORGID"
   }, {
     "expcode" : "t1.`ORGLEVEL`",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "ORGLEVEL"
   }, {
     "expcode" : "t1.`ORGNAME`",
-    "ordervalue" : 6,
+    "ordervalue" : 7,
     "psdedqcodeexpname" : "ORGNAME"
   }, {
     "expcode" : "t1.`PORGID`",
-    "ordervalue" : 7,
+    "ordervalue" : 8,
     "psdedqcodeexpname" : "PORGID"
   }, {
     "expcode" : "t11.`ORGNAME`",
-    "ordervalue" : 8,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "PORGNAME"
   }, {
     "expcode" : "t1.`SHORTNAME`",
-    "ordervalue" : 9,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "SHORTNAME"
   }, {
     "expcode" : "t1.`SHOWORDER`",
-    "ordervalue" : 10,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "SHOWORDER"
   }, {
     "expcode" : "t1.`UPDATEDATE`",
-    "ordervalue" : 11,
+    "ordervalue" : 12,
     "psdedqcodeexpname" : "UPDATEDATE"
   } ],
   "psdedqcodeconds" : [ {

PSMODULES/ou/PSDATAENTITIES/SYS_ORG/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`CREATEDATE`,\nt1.`DOMAINS`,\nt1.`ENABLE`,\nt1.`ORGCODE`,\nt1.`ORGID`,\nt1.`ORGLEVEL`,\nt1.`ORGNAME`,\nt1.`PORGID`,\nt11.`ORGNAME` AS `PORGNAME`,\nt1.`SHORTNAME`,\nt1.`SHOWORDER`,\nt1.`UPDATEDATE`\nFROM `IBZORG` t1 \nLEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID \n",
+  "querycode" : "SELECT\nt1.`CREATEDATE`,\nt1.`DOMAINS`,\nt1.`ENABLE`,\nt1.`ISVALID`,\nt1.`ORGCODE`,\nt1.`ORGID`,\nt1.`ORGLEVEL`,\nt1.`ORGNAME`,\nt1.`PORGID`,\nt11.`ORGNAME` AS `PORGNAME`,\nt1.`SHORTNAME`,\nt1.`SHOWORDER`,\nt1.`UPDATEDATE`\nFROM `IBZORG` t1 \nLEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -15,40 +15,44 @@
     "ordervalue" : 2,
     "psdedqcodeexpname" : "ENABLE"
   }, {
-    "expcode" : "t1.`ORGCODE`",
+    "expcode" : "t1.`ISVALID`",
     "ordervalue" : 3,
+    "psdedqcodeexpname" : "ISVALID"
+  }, {
+    "expcode" : "t1.`ORGCODE`",
+    "ordervalue" : 4,
     "psdedqcodeexpname" : "ORGCODE"
   }, {
     "expcode" : "t1.`ORGID`",
-    "ordervalue" : 4,
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "ORGID"
   }, {
     "expcode" : "t1.`ORGLEVEL`",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "ORGLEVEL"
   }, {
     "expcode" : "t1.`ORGNAME`",
-    "ordervalue" : 6,
+    "ordervalue" : 7,
     "psdedqcodeexpname" : "ORGNAME"
   }, {
     "expcode" : "t1.`PORGID`",
-    "ordervalue" : 7,
+    "ordervalue" : 8,
     "psdedqcodeexpname" : "PORGID"
   }, {
     "expcode" : "t11.`ORGNAME`",
-    "ordervalue" : 8,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "PORGNAME"
   }, {
     "expcode" : "t1.`SHORTNAME`",
-    "ordervalue" : 9,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "SHORTNAME"
   }, {
     "expcode" : "t1.`SHOWORDER`",
-    "ordervalue" : 10,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "SHOWORDER"
   }, {
     "expcode" : "t1.`UPDATEDATE`",
-    "ordervalue" : 11,
+    "ordervalue" : 12,
     "psdedqcodeexpname" : "UPDATEDATE"
   } ],
   "psdedqcodeconds" : [ {

PSMODULES/ou/PSDATAENTITIES/SYS_ORG/PSDEFORMS/Main/PSDEFORM.json

@@ -7,7 +7,6 @@
     "caption" : "基本信息",
     "psdeformdetailname" : "formpage1",
     "detailtype" : "FORMPAGE",
-    "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.SYS_ORG.MAIN.FORMPAGE.FORMPAGE1]",
     "psdeformdetails" : [ {
       "psdefid" : "<PSDATAENTITY>/ORGID",
       "editortype" : "HIDDEN",
@@ -77,6 +76,14 @@
       "detailtype" : "FORMITEM",
       "logicname" : "上级单位",
       "psdeformid" : "<PSDEFORM>"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/ISVALID",
+      "caption" : "启用",
+      "psdeformdetailname" : "isvalid",
+      "psdefname" : "isvalid",
+      "detailtype" : "FORMITEM",
+      "logicname" : "启用标识",
+      "psdeformid" : "<PSDEFORM>"
     }, {
       "psdefid" : "<PSDATAENTITY>/CREATEDATE",
       "psdeformdetailname" : "createdate",

PSMODULES/ou/PSDATAENTITIES/SYS_ORG/PSDEGRIDS/Main/PSDEGRID.json

@@ -67,6 +67,14 @@
     "psdegridcolname" : "porgid",
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
+  }, {
+    "psdefname" : "isvalid",
+    "psdefid" : "<PSDATAENTITY>/ISVALID",
+    "logicname" : "启用标识",
+    "psdegridcolname" : "isvalid",
+    "caption" : "启用",
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
   }, {
     "psdefname" : "SHOWORDER",
     "psdefid" : "<PSDATAENTITY>/SHOWORDER",

PSMODULES/ou/PSDATAENTITIES/SYS_TEAMMEMBER/PSDATAENTITY.json

@@ -382,6 +382,47 @@
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "ordervalue" : 9,
+    "psdefieldname" : "USERNAME",
+    "psdatatypename" : "外键值附加数据",
+    "validflag" : 1,
+    "derpsdefid" : "<PSMODULE>/SYS_EMP/USERNAME",
+    "physicalfield" : 0,
+    "codename" : "UserName",
+    "psdatatypeid" : "PICKUPDATA",
+    "derpsdefname" : "USERNAME",
+    "pkey" : 0,
+    "logicname" : "登录名",
+    "majorfield" : 0,
+    "deftype" : 3,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdername" : "DER1N_SYS_TEAMMEMBER_SYS_EMP_USERID",
+    "psderid" : "<PSDATAENTITY>/DER1N_SYS_TEAMMEMBER_SYS_EMP_USERID",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[USERNAME][登录名]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[USERNAME][登录名]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "USERNAME",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    }, {
+      "psdefdtcolname" : "USERNAME",
+      "customdatatype" : 0,
+      "dbtype" : "POSTGRESQL"
+    }, {
+      "psdefdtcolname" : "USERNAME",
+      "customdatatype" : 0,
+      "dbtype" : "ORACLE"
+    } ]
   } ],
   "psdeopprivs" : [ {
     "logicname" : "建立",

PSMODULES/ou/PSDATAENTITIES/SYS_TEAMMEMBER/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`DOMAINS`,\nt21.`PERSONNAME`,\nt1.`POSTID`,\nt31.`POSTNAME`,\nt1.`TEAMID`,\nt1.`TEAMMEMBERID`,\nt11.`TEAMNAME`,\nt1.`USERID`\nFROM `IBZTEAMMEMBER` t1 \nLEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID \nLEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID \nLEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID \n",
+  "querycode" : "SELECT\nt1.`DOMAINS`,\nt21.`PERSONNAME`,\nt1.`POSTID`,\nt31.`POSTNAME`,\nt1.`TEAMID`,\nt1.`TEAMMEMBERID`,\nt11.`TEAMNAME`,\nt1.`USERID`,\nt21.`USERNAME`\nFROM `IBZTEAMMEMBER` t1 \nLEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID \nLEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID \nLEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -34,5 +34,9 @@
     "expcode" : "t1.`USERID`",
     "ordervalue" : 7,
     "psdedqcodeexpname" : "USERID"
+  }, {
+    "expcode" : "t21.`USERNAME`",
+    "ordervalue" : 8,
+    "psdedqcodeexpname" : "USERNAME"
   } ]
 }
\ No newline at end of file

PSMODULES/ou/PSDATAENTITIES/SYS_TEAMMEMBER/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/ORACLE/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.DOMAINS,\nt21.PERSONNAME,\nt1.POSTID,\nt31.POSTNAME,\nt1.TEAMID,\nt1.TEAMMEMBERID,\nt11.TEAMNAME,\nt1.USERID\nFROM IBZTEAMMEMBER t1 \nLEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID \nLEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID \nLEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID \n",
+  "querycode" : "SELECT\nt1.DOMAINS,\nt21.PERSONNAME,\nt1.POSTID,\nt31.POSTNAME,\nt1.TEAMID,\nt1.TEAMMEMBERID,\nt11.TEAMNAME,\nt1.USERID,\nt21.USERNAME\nFROM IBZTEAMMEMBER t1 \nLEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID \nLEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID \nLEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID \n",
   "dbtype" : "ORACLE",
   "psdedqcodename" : "Oracle",
   "psdedqcodeexps" : [ {
@@ -34,5 +34,9 @@
     "expcode" : "t1.USERID",
     "ordervalue" : 7,
     "psdedqcodeexpname" : "USERID"
+  }, {
+    "expcode" : "t21.USERNAME",
+    "ordervalue" : 8,
+    "psdedqcodeexpname" : "USERNAME"
   } ]
 }
\ No newline at end of file

PSMODULES/ou/PSDATAENTITIES/SYS_TEAMMEMBER/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`DOMAINS`,\nt21.`PERSONNAME`,\nt1.`POSTID`,\nt31.`POSTNAME`,\nt1.`TEAMID`,\nt1.`TEAMMEMBERID`,\nt11.`TEAMNAME`,\nt1.`USERID`\nFROM `IBZTEAMMEMBER` t1 \nLEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID \nLEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID \nLEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID \n",
+  "querycode" : "SELECT\nt1.`DOMAINS`,\nt21.`PERSONNAME`,\nt1.`POSTID`,\nt31.`POSTNAME`,\nt1.`TEAMID`,\nt1.`TEAMMEMBERID`,\nt11.`TEAMNAME`,\nt1.`USERID`,\nt21.`USERNAME`\nFROM `IBZTEAMMEMBER` t1 \nLEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID \nLEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID \nLEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -34,5 +34,9 @@
     "expcode" : "t1.`USERID`",
     "ordervalue" : 7,
     "psdedqcodeexpname" : "USERID"
+  }, {
+    "expcode" : "t21.`USERNAME`",
+    "ordervalue" : 8,
+    "psdedqcodeexpname" : "USERNAME"
   } ]
 }
\ No newline at end of file

PSMODULES/ou/PSDATAENTITIES/SYS_TEAMMEMBER/PSDEDATAQUERIES/VIEW/PSDEDQCODES/ORACLE/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.DOMAINS,\nt21.PERSONNAME,\nt1.POSTID,\nt31.POSTNAME,\nt1.TEAMID,\nt1.TEAMMEMBERID,\nt11.TEAMNAME,\nt1.USERID\nFROM IBZTEAMMEMBER t1 \nLEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID \nLEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID \nLEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID \n",
+  "querycode" : "SELECT\nt1.DOMAINS,\nt21.PERSONNAME,\nt1.POSTID,\nt31.POSTNAME,\nt1.TEAMID,\nt1.TEAMMEMBERID,\nt11.TEAMNAME,\nt1.USERID,\nt21.USERNAME\nFROM IBZTEAMMEMBER t1 \nLEFT JOIN IBZTEAM t11 ON t1.TEAMID = t11.TEAMID \nLEFT JOIN IBZEMP t21 ON t1.USERID = t21.USERID \nLEFT JOIN IBZPOST t31 ON t1.POSTID = t31.POSTID \n",
   "dbtype" : "ORACLE",
   "psdedqcodename" : "Oracle",
   "psdedqcodeexps" : [ {
@@ -34,5 +34,9 @@
     "expcode" : "t1.USERID",
     "ordervalue" : 7,
     "psdedqcodeexpname" : "USERID"
+  }, {
+    "expcode" : "t21.USERNAME",
+    "ordervalue" : 8,
+    "psdedqcodeexpname" : "USERNAME"
   } ]
 }
\ No newline at end of file

PSMODULES/ou/PSDATAENTITIES/SYS_TEAMMEMBER/PSDEGRIDS/Main/PSDEGRID.json

@@ -16,6 +16,14 @@
     "width" : 200,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
+  }, {
+    "psdefname" : "username",
+    "psdefid" : "<PSDATAENTITY>/USERNAME",
+    "logicname" : "登录名",
+    "psdegridcolname" : "username",
+    "width" : 200,
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
   }, {
     "psdefname" : "postname",
     "psdefid" : "<PSDATAENTITY>/POSTNAME",

PSMODULES/task/PSDATAENTITIES/JOBS_INFO/PSDEFORMS/Main/PSDEFORM.json

@@ -121,5 +121,13 @@
         "editortypename" : "标签"
       } ]
     } ]
+  } ],
+  "psdefivrs" : [ {
+    "psdefiid" : "<PSDEFORM>/formpage1/group1/cron",
+    "vrtype" : "SYSVALUERULE",
+    "checkmode" : 3,
+    "memo" : "防止输出到中文字符导致执行失败",
+    "pssysvalueruleid" : "ValueRule",
+    "psdefivrname" : "表单项值规则"
   } ]
 }
\ No newline at end of file

PSMODULES/uaa/PSDATAENTITIES/SYS_OPEN_ACCESS/PSDATAENTITY.json

@@ -438,6 +438,84 @@
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "ordervalue" : 12,
+    "psdefieldname" : "NOTIFY_URL",
+    "psdatatypename" : "文本，可指定长度",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "notify_url",
+    "psdatatypeid" : "TEXT",
+    "pkey" : 0,
+    "length" : 500,
+    "logicname" : "NotifyUrl",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "tablename" : "IBZOPENACCESS",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[NOTIFY_URL][NotifyUrl]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[NOTIFY_URL][NotifyUrl]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "NOTIFY_URL",
+      "customdatatype" : 0,
+      "dbtype" : "POSTGRESQL"
+    }, {
+      "psdefdtcolname" : "NOTIFY_URL",
+      "customdatatype" : 0,
+      "dbtype" : "ORACLE"
+    }, {
+      "psdefdtcolname" : "NOTIFY_URL",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "ordervalue" : 13,
+    "psdefieldname" : "AGENT_ID",
+    "psdatatypename" : "大整型",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "Agent_id",
+    "psdatatypeid" : "BIGINT",
+    "pkey" : 0,
+    "length" : 20,
+    "logicname" : "AGENT_ID",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "tablename" : "IBZOPENACCESS",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[AGENT_ID][AGENT_ID]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[AGENT_ID][AGENT_ID]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "AGENT_ID",
+      "customdatatype" : 0,
+      "dbtype" : "POSTGRESQL"
+    }, {
+      "psdefdtcolname" : "AGENT_ID",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    }, {
+      "psdefdtcolname" : "AGENT_ID",
+      "customdatatype" : 0,
+      "dbtype" : "ORACLE"
+    } ]
   } ],
   "psdeopprivs" : [ {
     "logicname" : "建立",

PSMODULES/uaa/PSDATAENTITIES/SYS_OPEN_ACCESS/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`ACCESSID`,\nt1.`ACCESSNAME`,\nt1.`ACCESS_KEY`,\nt1.`ACCESS_TOKEN`,\nt1.`DISABLED`,\nt1.`EXPIRES_TIME`,\nt1.`OPEN_TYPE`,\nt1.`REDIRECT_URI`,\nt1.`REGION_ID`,\nt1.`SECRET_KEY`\nFROM `IBZOPENACCESS` t1 \n",
+  "querycode" : "SELECT\nt1.`ACCESSID`,\nt1.`ACCESSNAME`,\nt1.`ACCESS_KEY`,\nt1.`ACCESS_TOKEN`,\nt1.`AGENT_ID`,\nt1.`DISABLED`,\nt1.`EXPIRES_TIME`,\nt1.`NOTIFY_URL`,\nt1.`OPEN_TYPE`,\nt1.`REDIRECT_URI`,\nt1.`REGION_ID`,\nt1.`SECRET_KEY`\nFROM `IBZOPENACCESS` t1 \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -19,28 +19,36 @@
     "ordervalue" : 3,
     "psdedqcodeexpname" : "ACCESS_TOKEN"
   }, {
-    "expcode" : "t1.`DISABLED`",
+    "expcode" : "t1.`AGENT_ID`",
     "ordervalue" : 4,
+    "psdedqcodeexpname" : "AGENT_ID"
+  }, {
+    "expcode" : "t1.`DISABLED`",
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "DISABLED"
   }, {
     "expcode" : "t1.`EXPIRES_TIME`",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "EXPIRES_TIME"
+  }, {
+    "expcode" : "t1.`NOTIFY_URL`",
+    "ordervalue" : 7,
+    "psdedqcodeexpname" : "NOTIFY_URL"
   }, {
     "expcode" : "t1.`OPEN_TYPE`",
-    "ordervalue" : 6,
+    "ordervalue" : 8,
     "psdedqcodeexpname" : "OPEN_TYPE"
   }, {
     "expcode" : "t1.`REDIRECT_URI`",
-    "ordervalue" : 7,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "REDIRECT_URI"
   }, {
     "expcode" : "t1.`REGION_ID`",
-    "ordervalue" : 8,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "REGION_ID"
   }, {
     "expcode" : "t1.`SECRET_KEY`",
-    "ordervalue" : 9,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "SECRET_KEY"
   } ]
 }
\ No newline at end of file

PSMODULES/uaa/PSDATAENTITIES/SYS_OPEN_ACCESS/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/ORACLE/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.ACCESSID,\nt1.ACCESSNAME,\nt1.ACCESS_KEY,\nt1.ACCESS_TOKEN,\nt1.DISABLED,\nt1.EXPIRES_TIME,\nt1.OPEN_TYPE,\nt1.REDIRECT_URI,\nt1.REGION_ID,\nt1.SECRET_KEY\nFROM IBZOPENACCESS t1 \n",
+  "querycode" : "SELECT\nt1.ACCESSID,\nt1.ACCESSNAME,\nt1.ACCESS_KEY,\nt1.ACCESS_TOKEN,\nt1.AGENT_ID,\nt1.DISABLED,\nt1.EXPIRES_TIME,\nt1.NOTIFY_URL,\nt1.OPEN_TYPE,\nt1.REDIRECT_URI,\nt1.REGION_ID,\nt1.SECRET_KEY\nFROM IBZOPENACCESS t1 \n",
   "dbtype" : "ORACLE",
   "psdedqcodename" : "Oracle",
   "psdedqcodeexps" : [ {
@@ -19,28 +19,36 @@
     "ordervalue" : 3,
     "psdedqcodeexpname" : "ACCESS_TOKEN"
   }, {
-    "expcode" : "t1.DISABLED",
+    "expcode" : "t1.AGENT_ID",
     "ordervalue" : 4,
+    "psdedqcodeexpname" : "AGENT_ID"
+  }, {
+    "expcode" : "t1.DISABLED",
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "DISABLED"
   }, {
     "expcode" : "t1.EXPIRES_TIME",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "EXPIRES_TIME"
+  }, {
+    "expcode" : "t1.NOTIFY_URL",
+    "ordervalue" : 7,
+    "psdedqcodeexpname" : "NOTIFY_URL"
   }, {
     "expcode" : "t1.OPEN_TYPE",
-    "ordervalue" : 6,
+    "ordervalue" : 8,
     "psdedqcodeexpname" : "OPEN_TYPE"
   }, {
     "expcode" : "t1.REDIRECT_URI",
-    "ordervalue" : 7,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "REDIRECT_URI"
   }, {
     "expcode" : "t1.REGION_ID",
-    "ordervalue" : 8,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "REGION_ID"
   }, {
     "expcode" : "t1.SECRET_KEY",
-    "ordervalue" : 9,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "SECRET_KEY"
   } ]
 }
\ No newline at end of file

PSMODULES/uaa/PSDATAENTITIES/SYS_OPEN_ACCESS/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`ACCESSID`,\nt1.`ACCESSNAME`,\nt1.`ACCESS_KEY`,\nt1.`ACCESS_TOKEN`,\nt1.`DISABLED`,\nt1.`EXPIRES_TIME`,\nt1.`OPEN_TYPE`,\nt1.`REDIRECT_URI`,\nt1.`REGION_ID`,\nt1.`SECRET_KEY`\nFROM `IBZOPENACCESS` t1 \n",
+  "querycode" : "SELECT\nt1.`ACCESSID`,\nt1.`ACCESSNAME`,\nt1.`ACCESS_KEY`,\nt1.`ACCESS_TOKEN`,\nt1.`AGENT_ID`,\nt1.`DISABLED`,\nt1.`EXPIRES_TIME`,\nt1.`NOTIFY_URL`,\nt1.`OPEN_TYPE`,\nt1.`REDIRECT_URI`,\nt1.`REGION_ID`,\nt1.`SECRET_KEY`\nFROM `IBZOPENACCESS` t1 \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -19,28 +19,36 @@
     "ordervalue" : 3,
     "psdedqcodeexpname" : "ACCESS_TOKEN"
   }, {
-    "expcode" : "t1.`DISABLED`",
+    "expcode" : "t1.`AGENT_ID`",
     "ordervalue" : 4,
+    "psdedqcodeexpname" : "AGENT_ID"
+  }, {
+    "expcode" : "t1.`DISABLED`",
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "DISABLED"
   }, {
     "expcode" : "t1.`EXPIRES_TIME`",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "EXPIRES_TIME"
+  }, {
+    "expcode" : "t1.`NOTIFY_URL`",
+    "ordervalue" : 7,
+    "psdedqcodeexpname" : "NOTIFY_URL"
   }, {
     "expcode" : "t1.`OPEN_TYPE`",
-    "ordervalue" : 6,
+    "ordervalue" : 8,
     "psdedqcodeexpname" : "OPEN_TYPE"
   }, {
     "expcode" : "t1.`REDIRECT_URI`",
-    "ordervalue" : 7,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "REDIRECT_URI"
   }, {
     "expcode" : "t1.`REGION_ID`",
-    "ordervalue" : 8,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "REGION_ID"
   }, {
     "expcode" : "t1.`SECRET_KEY`",
-    "ordervalue" : 9,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "SECRET_KEY"
   } ]
 }
\ No newline at end of file

PSMODULES/uaa/PSDATAENTITIES/SYS_OPEN_ACCESS/PSDEDATAQUERIES/VIEW/PSDEDQCODES/ORACLE/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.ACCESSID,\nt1.ACCESSNAME,\nt1.ACCESS_KEY,\nt1.ACCESS_TOKEN,\nt1.DISABLED,\nt1.EXPIRES_TIME,\nt1.OPEN_TYPE,\nt1.REDIRECT_URI,\nt1.REGION_ID,\nt1.SECRET_KEY\nFROM IBZOPENACCESS t1 \n",
+  "querycode" : "SELECT\nt1.ACCESSID,\nt1.ACCESSNAME,\nt1.ACCESS_KEY,\nt1.ACCESS_TOKEN,\nt1.AGENT_ID,\nt1.DISABLED,\nt1.EXPIRES_TIME,\nt1.NOTIFY_URL,\nt1.OPEN_TYPE,\nt1.REDIRECT_URI,\nt1.REGION_ID,\nt1.SECRET_KEY\nFROM IBZOPENACCESS t1 \n",
   "dbtype" : "ORACLE",
   "psdedqcodename" : "Oracle",
   "psdedqcodeexps" : [ {
@@ -19,28 +19,36 @@
     "ordervalue" : 3,
     "psdedqcodeexpname" : "ACCESS_TOKEN"
   }, {
-    "expcode" : "t1.DISABLED",
+    "expcode" : "t1.AGENT_ID",
     "ordervalue" : 4,
+    "psdedqcodeexpname" : "AGENT_ID"
+  }, {
+    "expcode" : "t1.DISABLED",
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "DISABLED"
   }, {
     "expcode" : "t1.EXPIRES_TIME",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "EXPIRES_TIME"
+  }, {
+    "expcode" : "t1.NOTIFY_URL",
+    "ordervalue" : 7,
+    "psdedqcodeexpname" : "NOTIFY_URL"
   }, {
     "expcode" : "t1.OPEN_TYPE",
-    "ordervalue" : 6,
+    "ordervalue" : 8,
     "psdedqcodeexpname" : "OPEN_TYPE"
   }, {
     "expcode" : "t1.REDIRECT_URI",
-    "ordervalue" : 7,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "REDIRECT_URI"
   }, {
     "expcode" : "t1.REGION_ID",
-    "ordervalue" : 8,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "REGION_ID"
   }, {
     "expcode" : "t1.SECRET_KEY",
-    "ordervalue" : 9,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "SECRET_KEY"
   } ]
 }
\ No newline at end of file

PSMODULES/uaa/PSDATAENTITIES/SYS_OPEN_ACCESS/PSDEFORMS/Main/PSDEFORM.json

@@ -59,6 +59,34 @@
         "detailtype" : "FORMITEM",
         "logicname" : "RegionId",
         "psdeformid" : "<PSDEFORM>"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/ACCESS_TOKEN",
+        "psdeformdetailname" : "access_token",
+        "psdefname" : "access_token",
+        "detailtype" : "FORMITEM",
+        "logicname" : "管理账号token",
+        "psdeformid" : "<PSDEFORM>"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/EXPIRES_TIME",
+        "psdeformdetailname" : "expires_time",
+        "psdefname" : "expires_time",
+        "detailtype" : "FORMITEM",
+        "logicname" : "管理账号token过期时间",
+        "psdeformid" : "<PSDEFORM>"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/NOTIFY_URL",
+        "psdeformdetailname" : "notify_url",
+        "psdefname" : "notify_url",
+        "detailtype" : "FORMITEM",
+        "logicname" : "NotifyUrl",
+        "psdeformid" : "<PSDEFORM>"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/AGENT_ID",
+        "psdeformdetailname" : "agent_id",
+        "psdefname" : "agent_id",
+        "detailtype" : "FORMITEM",
+        "logicname" : "AGENT_ID",
+        "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/DISABLED",
         "psdeformdetailname" : "disabled",

PSMODULES/uaa/PSDATAENTITIES/SYS_ROLE/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

@@ -23,14 +23,14 @@
     "psdeformid" : "<PSDATAENTITY>/Main",
     "configinfo" : "[表单]主编辑表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
-    "psdetoolbarid" : "Auto5",
+    "psdetoolbarname" : "工具栏模板（编辑界面_保存、关闭、拷贝）",
+    "psdetoolbarid" : "Auto5_5260",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+    "configinfo" : "[工具栏]工具栏模板（编辑界面_保存、关闭、拷贝）"
   } ]
 }
\ No newline at end of file

PSMODULES/uaa/PSDATAENTITIES/SYS_USER_AUTH/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/ORACLE/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.AUTHID,\nt1.CREDENTIAL,\nt1.IDENTIFIER,\nt1.IDENTITY_TYPE,\nt1.USERID\nFROM IBZUSERAUTH t1 \n",
+  "querycode" : "SELECT\nt1.AUTHID,\nt1.CREDENTIAL,\nt1.IDENTIFIER,\nt1.IDENTITY_TYPE,\nt1.USERID,\nt11.USERNAME\nFROM IBZUSERAUTH t1 \nLEFT JOIN IBZUSER t11 ON t1.USERID = t11.USERID \n",
   "dbtype" : "ORACLE",
   "psdedqcodename" : "Oracle",
   "psdedqcodeexps" : [ {
@@ -22,5 +22,9 @@
     "expcode" : "t1.USERID",
     "ordervalue" : 4,
     "psdedqcodeexpname" : "USERID"
+  }, {
+    "expcode" : "t11.USERNAME",
+    "ordervalue" : 5,
+    "psdedqcodeexpname" : "USERNAME"
   } ]
 }
\ No newline at end of file

PSMODULES/uaa/PSDATAENTITIES/SYS_USER_AUTH/PSDEDATAQUERIES/VIEW/PSDEDQCODES/ORACLE/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.AUTHID,\nt1.CREDENTIAL,\nt1.IDENTIFIER,\nt1.IDENTITY_TYPE,\nt1.USERID\nFROM IBZUSERAUTH t1 \n",
+  "querycode" : "SELECT\nt1.AUTHID,\nt1.CREDENTIAL,\nt1.IDENTIFIER,\nt1.IDENTITY_TYPE,\nt1.USERID,\nt11.USERNAME\nFROM IBZUSERAUTH t1 \nLEFT JOIN IBZUSER t11 ON t1.USERID = t11.USERID \n",
   "dbtype" : "ORACLE",
   "psdedqcodename" : "Oracle",
   "psdedqcodeexps" : [ {
@@ -22,5 +22,9 @@
     "expcode" : "t1.USERID",
     "ordervalue" : 4,
     "psdedqcodeexpname" : "USERID"
+  }, {
+    "expcode" : "t11.USERNAME",
+    "ordervalue" : 5,
+    "psdedqcodeexpname" : "USERNAME"
   } ]
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(ALLDEPATMENTMULTIPLE)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "filter=单位id对应的表单项名称，不设置时filter默认取当前登录人的所在单位srforgid\nurl=ibzorganizations/${orgid}/suborg/ibzdepartments/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "ALLDEPATMENTMULTIPLE",
-  "ctrlparams" : "url=/ibzorganizations/${orgid}/suborg/ibzdepartments/picker\nfilter=srforgid\nmultiple=true",
+  "ctrlparams" : "url=/sysorganizations/${orgid}/suborg/sysdepartments/picker\nfilter=srforgid\nmultiple=true",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(ALLDEPATMENTSELECT)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "filter=单位id对应的表单项名称，不设置时filter默认取当前登录人的所在单位srforgid\nurl=ibzorganizations/${orgid}/suborg/ibzdepartments/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "ALLDEPATMENTSELECT",
-  "ctrlparams" : "url=/ibzorganizations/${orgid}/suborg/ibzdepartments/picker\nfilter=srforgid",
+  "ctrlparams" : "url=/sysorganizations/${orgid}/suborg/sysdepartments/picker\nfilter=srforgid",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(ALLEMPMULTIPLE)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "左边有一个单位树，filter设置的单位id对应的表单项筛选，filter不设置默认按照当前登录人所属单位srforgid\ntreeurl=/ibzorganizations/${orgid}/suborg/picker\n人员按照选中的树节点对应的orgid来筛选\nurl=/ibzorganizations/${selected-orgid}/ibzemployees/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "ALLEMPMULTIPLE",
-  "ctrlparams" : "filter=srforgid\nmultiple=true\ntreeurl=/ibzorganizations/${orgid}/suborg/picker\nurl=/ibzorganizations/${selected-orgid}/ibzemployees/picker",
+  "ctrlparams" : "filter=srforgid\nmultiple=true\ntreeurl=/sysorganizations/${orgid}/suborg/picker\nurl=/sysorganizations/${selected-orgid}/sysemployees/picker",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(ALLEMPSELECT)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "左边有一个单位树，filter设置的单位id对应的表单项筛选，filter不设置默认按照当前登录人所属单位srforgid\ntreeurl=/ibzorganizations/${orgid}/suborg/picker\n人员按照选中的树节点对应的orgid来筛选\nurl=/ibzorganizations/${selected-orgid}/ibzemployees/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "ALLEMPSELECT",
-  "ctrlparams" : "filter=srforgid\ntreeurl=/ibzorganizations/${orgid}/suborg/picker\nurl=/ibzorganizations/${selected-orgid}/ibzemployees/picker\nmultiple=false",
+  "ctrlparams" : "filter=srforgid\ntreeurl=/sysorganizations/${orgid}/suborg/picker\nurl=/sysorganizations/${selected-orgid}/sysemployees/picker\nmultiple=false",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(ALLORGMULTIPLE)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "全部单位选择，强行按照  filter=alls来处理，不接收参数，查询就是全部单位\nurl=ibzorganizations/alls/suborg/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "ALLORGMULTIPLE",
-  "ctrlparams" : "url=/ibzorganizations/alls/suborg/picker\nmultiple=true",
+  "ctrlparams" : "url=/sysorganizations/alls/suborg/picker\nmultiple=true",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(ALLORGSELECT)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "全部单位选择，强行按照  filter=alls来处理，不接收参数，查询就是全部单位\nurl=ibzorganizations/alls/suborg/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "ALLORGSELECT",
-  "ctrlparams" : "url=/ibzorganizations/alls/suborg/picker",
+  "ctrlparams" : "url=/sysorganizations/alls/suborg/picker",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(DEPATMENTMULTIPLE)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "filter=单位id对应的表单项名称，不设置时filter默认取当前登录人的所在单位srforgid\nurl=ibzorganizations/${orgid}/ibzdepartments/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "DEPATMENTMULTIPLE",
-  "ctrlparams" : "url=/ibzorganizations/${orgid}/ibzdepartments/picker\nfilter=srforgid\nmultiple=true",
+  "ctrlparams" : "url=/sysorganizations/${orgid}/sysdepartments/picker\nfilter=srforgid\nmultiple=true",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(DEPATMENTSELECT)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "filter=单位id对应的表单项名称，不设置时filter默认取当前登录人的所在单位srforgid\nurl=/ibzorganizations/${orgid}/ibzdepartments/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "DEPATMENTSELECT",
-  "ctrlparams" : "url=/ibzorganizations/${orgid}/ibzdepartments/picker\nfilter=srforgid",
+  "ctrlparams" : "url=/sysorganizations/${orgid}/sysdepartments/picker\nfilter=srforgid",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(EMPMULTIPLE)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "左边没有单位树，人员按照filter设置的单位id对应的表单项筛选，filter不设置默认按照当前登录人所属单位srforgid\nurl=/ibzorganizations/${selected-orgid}/ibzemployees/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "EMPMULTIPLE",
-  "ctrlparams" : "filter=srforgid\nmultiple=true\nurl=/ibzorganizations/${selected-orgid}/ibzemployees/picker",
+  "ctrlparams" : "filter=srforgid\nmultiple=true\nurl=/sysorganizations/${selected-orgid}/sysemployees/picker",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(EMPSELECT)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "左边没有单位树，人员按照filter设置的单位id对应的表单项筛选，filter不设置默认按照当前登录人所属单位srforgid\nurl=/ibzorganizations/${selected-orgid}/ibzemployees/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "EMPSELECT",
-  "ctrlparams" : "filter=srforgid\nurl=/ibzorganizations/${selected-orgid}/ibzemployees/picker\nmultiple=false",
+  "ctrlparams" : "filter=srforgid\nurl=/sysorganizations/${selected-orgid}/sysemployees/picker\nmultiple=false",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(ORGMULTIPLE)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "filter=指定单位id对应的表单项名称，不设置时filter默认取当前登录人的所在单位srforgid\nurl=ibzorganizations/${orgid}/suborg/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "ORGMULTIPLE",
-  "ctrlparams" : "url=/ibzorganizations/${orgid}/suborg/picker\nfilter=srforgid\nmultiple=true",
+  "ctrlparams" : "url=/sysorganizations/${orgid}/suborg/picker\nfilter=srforgid\nmultiple=true",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSEDITORSTYLES/PICKER(ORGSELECT)/PSSYSEDITORSTYLE.json

@@ -4,6 +4,6 @@
   "memo" : "filter=指定单位id对应的表单项名称，不设置时filter默认取当前登录人的所在单位srforgid\nurl=ibzorganizations/${orgid}/suborg/picker",
   "pseditortypeid" : "PICKER",
   "codename" : "ORGSELECT",
-  "ctrlparams" : "url=/ibzorganizations/${orgid}/suborg/picker\nfilter=srforgid",
+  "ctrlparams" : "url=/sysorganizations/${orgid}/suborg/picker\nfilter=srforgid",
   "repdefault" : 0
 }
\ No newline at end of file

PSSYSVALUERULES/ValueRule/PSSYSVALUERULE.json

+{
+  "ruletype" : "REG",
+  "ruleinfo" : "请输入CRON表达式允许的合法符号",
+  "regexpcode" : "^[A-Z0-9-/\\,?:*# ]+$",
+  "codename" : "ValueRule",
+  "pssysvaluerulename" : "cron正则允许的符号"
+}
\ No newline at end of file