yang G 5 lat temu
rodzic
commit
bd23278ebb

+ 9 - 0
src/main/java/com/mokamrp/privates/mapper/pojo/SetUserTag.java

@@ -36,6 +36,7 @@ public class SetUserTag extends Model<SetUserTag> {
     private Integer authId;
 
     private String authName;
+    private Integer mainId;
 
     /**
      * 0进行中 1-成功 2-失败
@@ -46,6 +47,14 @@ public class SetUserTag extends Model<SetUserTag> {
 
     private String tagNameParam;
 
+    public Integer getMainId() {
+        return mainId;
+    }
+
+    public void setMainId(Integer mainId) {
+        this.mainId = mainId;
+    }
+
     public String getTagNameParam() {
         return tagNameParam;
     }

+ 9 - 4
src/main/java/com/mokamrp/privates/service/impl/WorkContactEmployeeServiceImpl.java

@@ -123,6 +123,12 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
 
         Collection<SetUserTag> entityList = new ArrayList<SetUserTag>();
         SetUserTagMain mainObj = new SetUserTagMain();
+
+        mainObj.setAuthId(authUser.getId());
+        mainObj.setAuthName(authUser.getName());
+        mainObj.setTotalNum(entityList.size());
+        SetUserTagMainService.save(mainObj);
+
         for (int i = 0;i<row.size();i++) {
             Map<String, String> cell = row.get(i);
             SetUserTag obj = new SetUserTag();
@@ -137,16 +143,15 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
             obj.setAuthId(authUser.getId());
             obj.setAuthName(authUser.getName());
             obj.setSourceFanId(fanId);
+            obj.setMainId(mainObj.getId());
             obj.setSourceTagNames(tagNames);
             //查找指定的标签
             entityList.add(obj);
         }
 
+
         setUserTagService.saveBatch(entityList);
-        mainObj.setAuthId(authUser.getId());
-        mainObj.setAuthName(authUser.getName());
-        mainObj.setTotalNum(entityList.size());
-        SetUserTagMainService.save(mainObj);
+
 
         return null;
     }