修改org树形接口筛选条件

controllers/partial/SystemController.go

@@ -30,10 +30,13 @@ func System_Sidebar(c *entitys.CtrlContext) {
 func System_GetMenuTree(c *entitys.CtrlContext) {
 	_type := c.Ctx.DefaultQuery("type", "")
 	type_op := c.Ctx.DefaultQuery("type_op", "")
+	hidden := c.Ctx.DefaultQuery("hidden", "")
+	name := c.Ctx.DefaultQuery("name", "")
+	cn_id := c.Ctx.DefaultQuery("cn_id", "")
 
 	op := template.HTML(type_op)
 
-	paramMap_i_t := map[string]interface{}{"sort": "name", "type": _type, "type_op": op}
+	paramMap_i_t := map[string]interface{}{"name": name, "cn_id": cn_id, "sort": "name", "type": _type, "type_op": op, "hidden": hidden}
 	result, err := sysutils.TreeSearch(c.Db, "system", "get_menu_tree", "sys_menu", paramMap_i_t)
 
 	if err == nil {
@@ -623,7 +626,7 @@ func System_AddOrg(c *entitys.CtrlContext) {
 	paramObj0.Id = sysutils.NewUUID()
 	paramObj0.CreateBy = user.UserId
 	paramObj0.LastUpdateBy = user.UserId
-	paramObj0.CreateTime = time.Now()
+	paramObj0.CreateTime = models.NowLocal()
 	paramObj0.LastUpdateTime = time.Now().UnixNano()
 	paramObj0.DelFlag = 0
 
@@ -676,15 +679,38 @@ func System_DelOrg(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateOrg(c *entitys.CtrlContext) {
-	name := c.Ctx.Query("name")
-	domain := c.Ctx.Query("domain")
-	parent := c.Ctx.Query("parent")
-
-	ret := __none_func_system__(name, domain, parent)
-	if ret {
+	//name := c.Ctx.Query("name")
+	//domain := c.Ctx.Query("domain")
+	//parent := c.Ctx.Query("parent")
+	
+	var paramObj0 models.SysOrg
+	err := c.Ctx.BindJSON(&paramObj0)
+	
+	tk, _ := c.Ctx.Get("token")
+	user := tk.(*entitys.Token)
+	
+	if paramObj0.Parent != "" {
+		parentNodes := []sysmodel.SysOrg{}
+		err := c.Db.SqlMapClient("one_sys_org", paramObj0.Parent).Find(&parentNodes)
+		if err != nil {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+			return
+		}
+		paramObj0.Inheritance = fmt.Sprintf("|%s%s", paramObj0.Id, parentNodes[0].Inheritance)
+	} else {
+		paramObj0.Inheritance = fmt.Sprintf("|%s|", paramObj0.Id)
+	}
+	
+	paramObj0.LastUpdateBy = user.UserId
+	paramObj0.LastUpdateTime = time.Now().UnixNano()
+	
+	paramMap, err := sysutils.BeanToMap(&paramObj0)
+	_, err = c.Db.SqlMapClient("update_sys_org", paramMap).Execute()
+	
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 

engine/system_init.go

@@ -48,7 +48,7 @@ func initPlatformDbData(db *xorm.Engine) {
 		{
 			Id:             "287c50a4-caad-4557-80c8-aca81af9f370",
 			Name:           "安全智管家平台",
-			CreateTime:     time.Now(),
+			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
 		},
 	}

light-apiengine.xml

@@ -356,7 +356,7 @@
             <column name="status" caption="状态 0：禁用   1：正常" type="int32"/>
             <column isNull="false" name="domain" caption="域" type="string" size="50" dbtype="varchar(36)"/>
             <column isNull="false" name="create_by" caption="创建人" type="string" size="36" dbtype="varchar(36)"/>
-            <column isNull="false" name="create_time" caption="创建时间" type="datetime" />
+            <column isNull="false" name="create_time" caption="创建时间" type="local_time" />
             <column isNull="false" name="last_update_by" caption="最后更新人" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="last_update_time" caption="最后更新时间" type="int64" />
             <column isNull="false" name="del_flag" caption="是否删除 1：删除   0：正常" type="int32"/>

models/SysOrgTree_gen.go

@@ -1,7 +1,6 @@
 
 package models
 import (
-"time"
 //__import_packages__
 )
 
@@ -31,7 +30,7 @@ type SysOrgTree struct {
 	//创建人
 	CreateBy string `json:"create_by"`
 	//创建时间
-	CreateTime time.Time `json:"create_time"`
+	CreateTime LocalTime `json:"create_time"`
 	//最后更新人
 	LastUpdateBy string `json:"last_update_by"`
 	//最后更新时间

models/SysOrg_gen.go

@@ -1,8 +1,7 @@
 
 package models
 import (
-	"time"
-//__import_packages__
+	//__import_packages__
 )
 
 type SysOrg struct {
@@ -29,7 +28,7 @@ type SysOrg struct {
 	//创建人
 	CreateBy   string    `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
 	//创建时间
-	CreateTime   time.Time    `xorm:"'create_time' notnull "json:"create_time"`
+	CreateTime   LocalTime    `xorm:"'create_time' notnull "json:"create_time"`
 	//最后更新人
 	LastUpdateBy   string    `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
 	//最后更新时间

sqlconfig/system_controller/system_find_menu_page_count.tpl

@@ -15,5 +15,8 @@ where
     and inheritance like '%{{.cn_id}}%'
 {{end}}
 {{if ne .type_op ""}}
-    and type {{.type_op }} {{.type}}
+    and type {{.type_op}} {{.type}}
+{{end}}
+{{if ne .hidden ""}}
+    and hidden = {{.hidden}}
 {{end}}

sqlconfig/system_controller/system_find_menu_page_select.tpl

@@ -15,7 +15,10 @@ where
     and inheritance like '%{{.cn_id}}%'
 {{end}}
 {{if ne .type_op ""}}
-    and type {{.type_op }} {{.type}}
+    and type {{.type_op}} {{.type}}
+{{end}}
+{{if ne .hidden ""}}
+    and hidden = {{.hidden}}
 {{end}}
 order by order_num
 LIMIT {{.rows}} OFFSET {{.offset}}

sqlconfig/system_controller/system_get_menu_tree.tpl

@@ -5,7 +5,16 @@ from
     sys_menu
 where
     del_flag = 0
+{{if ne .name ""}}
+    and name like '%{{.name}}%'
+{{end}}
 {{if ne .type_op ""}}
     and type {{.type_op }} {{.type}}
 {{end}}
+{{if ne .hidden ""}}
+    and hidden = {{.hidden}}
+{{end}}
+{{if ne .type_op ""}}
+    and type {{.type_op}} {{.type}}
+{{end}}
 order by order_num