Merge branch 'dev_v1.0.25_wh' of BaseService/biService into feature/v1.0.25

service/infoService.go

@@ -22,16 +22,16 @@ func (l *InfoService) Myinfo(sid string) []byte {
 		info_m, _ := info_i.(map[string]interface{})
 		entNicheDis := common.Int64All(info_m["entNicheDis"])
 		depIDArr := ""
-		if entNicheDis > 0 {
-			//查询所有部门标识
-			entId := gconv.String(info_m["entId"])
-			entDeptId := gconv.String(info_m["entDeptId"])
-			deptArr := entity.JyMysql.SelectBySql("select GROUP_CONCAT(DISTINCT b.id)  as depIDArr from entniche_department_parent a     INNER JOIN entniche_department b "+
-				"on (b.ent_id=? and (b.id=? or (a.pid=? and a.id=b.id)))", entId, entDeptId, entDeptId)
-			if len(*deptArr) > 0 {
-				depIDArr = common.InterfaceToStr((*deptArr)[0]["depIDArr"])
-			}
+		//if entNicheDis > 0 {
+		//查询所有部门标识
+		entId := gconv.String(info_m["entId"])
+		entDeptId := gconv.String(info_m["entDeptId"])
+		deptArr := entity.JyMysql.SelectBySql("select GROUP_CONCAT(DISTINCT b.id)  as depIDArr from entniche_department_parent a     INNER JOIN entniche_department b "+
+			"on (b.ent_id=? and (b.id=? or (a.pid=? and a.id=b.id)))", entId, entDeptId, entDeptId)
+		if len(*deptArr) > 0 {
+			depIDArr = common.InterfaceToStr((*deptArr)[0]["depIDArr"])
 		}
+		//}
 		//营销版本查询
 		accountId := gconv.Int64(info_m["accountId"])
 		entAccountId := gconv.Int64(info_m["entAccountId"])