|
@@ -514,6 +514,8 @@ func Merge(wId, pId string, choose map[string]int, noteFunc ...func(string)) err
|
|
{
|
|
{
|
|
savePositions := public.BaseService.SelectBySql(`select * from base_position where user_id=? and type=1`, saveBsId)
|
|
savePositions := public.BaseService.SelectBySql(`select * from base_position where user_id=? and type=1`, saveBsId)
|
|
delPositions := public.BaseService.SelectBySql(`select * from base_position where user_id=? and type=1`, delBsId)
|
|
delPositions := public.BaseService.SelectBySql(`select * from base_position where user_id=? and type=1`, delBsId)
|
|
|
|
+ log.Println("savePositions======", savePositions)
|
|
|
|
+ log.Println("delPositions======", delPositions)
|
|
//保留的没有企业身份,舍弃的有企业身份
|
|
//保留的没有企业身份,舍弃的有企业身份
|
|
if (savePositions == nil || len(*savePositions) == 0) && (delPositions != nil && len(*delPositions) > 0) {
|
|
if (savePositions == nil || len(*savePositions) == 0) && (delPositions != nil && len(*delPositions) > 0) {
|
|
ok := public.BaseService.ExecTx("合并舍弃用户的企业身份", func(tx *sql.Tx) bool {
|
|
ok := public.BaseService.ExecTx("合并舍弃用户的企业身份", func(tx *sql.Tx) bool {
|