上传文件，修改个人信息

internal/logic/get_erp_mkt_net_work_detail_tree_logic.go

@@ -36,7 +36,7 @@ func (l *GetErpMktNetWorkDetailTreeLogic) GetErpMktNetWorkDetailTree(in *transfo
 		where
 			mkt_network_detail.del_flag = 0
             and id>=1000
-			and (id in (1001,1002,1003,1004,1005)or !ISNULL(mkt_network_detail.parent))
+			and (id in (1001,1002,1003,1004,1005) or !ISNULL(mkt_network_detail.parent))
 		`
 	err := l.svcCtx.SqlConn.QueryRows(networks, sql)
 	for _, newwork := range *networks {

internal/logic/get_user_logic.go

@@ -31,18 +31,21 @@ func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserRespon
 	if in.Id != "" && in.Id != "0" {
 		u, err := l.svcCtx.SysUserModel.FindOne(in.Id)
 		if err != nil && err != sqlc.ErrNotFound {
-			return &tfr, nil
+			return &tfr, err
 		} else if u != nil {
 			user = *u
 		}
 	} else if in.Phone != "" {
 		u, err := l.svcCtx.SysUserModel.FindOneByPhone(in.Phone)
 		if err != nil && err != sqlc.ErrNotFound {
-			return &tfr, nil
+			return &tfr, err
 		} else if u != nil {
 			user = *u
 		}
 	}
+	if user.Id == "" {
+		return &tfr, nil
+	}
 	tfr.Id = user.Id
 	tfr.Phone = user.Mobile
 	tfr.Status = user.Status.Int64
@@ -50,51 +53,51 @@ func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserRespon
 	tfr.UserName = user.Name
 	ext, err := l.svcCtx.ErpUtil.InRoles(user.Id, "TMKZHUGUAN", "LAMK", "TMKmanager", "TMKassistant", "NetTMKdirector", "NetTMKassistant", "LAMKM", "LATMK")
 	if err != nil {
-		return &tfr, nil
+		return &tfr, err
 	} else if ext {
 		tfr.ErpRoleType = 1
 	}
-	if in.Phone != "" {
-		var mk model.MktPartTimeUser
-		err := l.svcCtx.SqlConn.QueryRowPartial(&mk, `
-			SELECT
-			mkt_part_time_user.id,
-			mkt_part_time_user.name,
-			mkt_part_time_user.sex,
-			mkt_part_time_user.name,
-			mkt_part_time_user.ipone_number,
-			mkt_part_time_user_city.name city_name,
-			mkt_part_time_user_city.organ_id
-			FROM
-				mkt_part_time_user
-			LEFT JOIN (
-				SELECT
-					mkt_part_time_user_city.organ_id,
-					mkt_part_time_user_city.ptuser_id,
-					base_organ.name
-				FROM
-					mkt_part_time_user_city,base_organ
-				WHERE
-					base_organ.id = mkt_part_time_user_city.organ_id
-			
-			) mkt_part_time_user_city
-			ON
-			mkt_part_time_user_city.ptuser_id = mkt_part_time_user.id
-			WHERE
-				del_flag = 0 and ipone_number=?
-		`, in.Phone)
-
-		if err != nil {
-			logx.Error(err)
-			return &tfr, nil
-		}
-		if err == nil && mk.Id != 0 {
-			tfr.ErpRoleType = 2
-			tfr.Gender = mk.Sex.Int64
-			tfr.UserName = mk.Name.String
-			tfr.CityName = mk.CityName.String
-			return &tfr, nil
-		}
-	}
-	return &tfr, err
+	//if in.Phone != "" {
+	//	var mk model.MktPartTimeUser
+	//	err := l.svcCtx.SqlConn.QueryRowPartial(&mk, `
+	//		SELECT
+	//		mkt_part_time_user.id,
+	//		mkt_part_time_user.name,
+	//		mkt_part_time_user.sex,
+	//		mkt_part_time_user.name,
+	//		mkt_part_time_user.ipone_number,
+	//		mkt_part_time_user_city.name city_name,
+	//		mkt_part_time_user_city.organ_id
+	//		FROM
+	//			mkt_part_time_user
+	//		LEFT JOIN (
+	//			SELECT
+	//				mkt_part_time_user_city.organ_id,
+	//				mkt_part_time_user_city.ptuser_id,
+	//				base_organ.name
+	//			FROM
+	//				mkt_part_time_user_city,base_organ
+	//			WHERE
+	//				base_organ.id = mkt_part_time_user_city.organ_id
+	//
+	//		) mkt_part_time_user_city
+	//		ON
+	//		mkt_part_time_user_city.ptuser_id = mkt_part_time_user.id
+	//		WHERE
+	//			del_flag = 0 and ipone_number=?
+	//	`, in.Phone)
+	//
+	//	if err != nil {
+	//		logx.Error(err)
+	//		return &tfr, nil
+	//	}
+	//	if err == nil && mk.Id != 0 {
+	//		tfr.ErpRoleType = 2
+	//		tfr.Gender = mk.Sex.Int64
+	//		tfr.UserName = mk.Name.String
+	//		tfr.CityName = mk.CityName.String
+	//		return &tfr, nil
+	//	}
+	//}
+	return &tfr, nil
 }

model/sys_user_model.go

@@ -98,7 +98,7 @@ func (m *defaultSysUserModel) FindOneByPhone(phone string) (*SysUser, error) {
 	var resp SysUser
 	err := m.QueryRow(&resp, sysUserIPhoneKey, func(conn sqlx.SqlConn, v interface{}) error {
 		query := fmt.Sprintf("select %s from %s where `mobile` = ? limit 1", sysUserRows, m.table)
-		return conn.QueryRow(v, query, cacheSysUserPhonePrefix)
+		return conn.QueryRow(v, query, phone)
 	})
 	switch err {
 	case nil:

sqlconfig/mkt_activity/mkt_activity_all_select.tpl

@@ -6,8 +6,8 @@ left join
     mkt_activities_school act_sch
 on
     act.id = act_sch.ma_id
-where
     {{if .school_id }}
+        where
         act.del_flag = 0
         and  act_sch.school_id = '{{.school_id}}'
     {{end}}