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

service/infoService.go

@@ -25,9 +25,8 @@ func (l *InfoService) Myinfo(sid string) []byte {
 			//查询所有部门标识
 			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)
+			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"])
 			}