瀏覽代碼

修改华北区域信息数据

songyh 3 年之前
父節點
當前提交
080e405f69

+ 0 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IUserAllocationService.java

@@ -69,8 +69,6 @@ public interface IUserAllocationService extends IService<UserAllocation> {
 
     List<Long> queryAutomaticAccounts(Long projectId);
 
-
-
     Result<UserAllocation> editUserAlloCation(UserAllocation userAllocation);
 
 }

+ 3 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/UserCompanyServiceImpl.java

@@ -52,7 +52,6 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
                 }
                 if (!"1".equals(depart.getOrgType())) {
                     depId = depart.getParentId();
-                    continue;
                 } else {
                     UserCompany userCompany = new UserCompany();
                     userCompany.setUserId(user.getId());
@@ -62,7 +61,7 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
                     String departName = depart.getDepartName();
                     if(!Check.isNull(departName)){
                         if(departName.trim().contains("北京汇创思拓数字科技有限公司")){
-                            userCompany.setNickName("华北,石家庄");
+                            userCompany.setNickName("华北");
                         }
                         if(departName.trim().contains("上海汇创思拓数字科技有限公司")){
                             userCompany.setNickName("华东");
@@ -74,7 +73,7 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
                             userCompany.setNickName("华南");
                         }
                         if(departName.trim().contains("北京次元像素")){
-                            userCompany.setNickName("华北,石家庄");
+                            userCompany.setNickName("石家庄");
                         }
                         if(departName.trim().contains("杭州妙构思数字科技有限公司")){
                             userCompany.setNickName("杭州");
@@ -109,7 +108,7 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
     /**
      * 删除公司信息
      *
-     * @param
+     * @param userId 用户id
      */
     @Override
     public void removeByUserId(String userId) {

+ 3 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

@@ -35,6 +35,7 @@ import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,13 +56,13 @@ import java.util.Map;
 public class UserAllocationController {
     @Autowired
     private IUserAllocationService userAllocationService;
-    @Autowired
+    @Resource
     private UserAllocationMapper userAllocationMapper;
     @Autowired
     private IProjectService projectService;
     @Autowired
     private ISysRoleExtService sysRoleService;
-    @Autowired
+    @Resource
     private ProjectMemberMapper memberMapper;
     @Autowired
     private IProjectMemberService projectMemberService;
@@ -71,8 +72,6 @@ public class UserAllocationController {
     @Autowired
     private IKuaishouInterfaceService kuaishouInterfaceService;
     @Autowired
-    private IKuaiShouAdvertiserBaseInfoService kuaiShouAdvertiserBaseInfoService;
-    @Autowired
     private IByteDanceAdvertiserDataService advertiserDataService;
 
 
@@ -309,9 +308,7 @@ public class UserAllocationController {
             result.setSuccess(false);
             result.success("查询失败");
         }
-
         return result;
-
     }
 
 
@@ -529,9 +526,6 @@ public class UserAllocationController {
      * @param userAllocation
      * @return
      */
-    @Autowired
-    private IRuleAccountTemplateService ruleAccountTemplateService;
-
     @ApiOperation(value = "用户分配-编辑", notes = "用户分配-编辑")
     @PutMapping(value = "/edit")
     public Result<UserAllocation> edit(@RequestBody UserAllocation userAllocation) {

+ 0 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -35,7 +35,6 @@ import java.util.Map;
  */
 @Service
 public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, ProjectMember> implements IProjectMemberService {
-
     @Autowired
     private ProjectMemberMapper memberMapper;
     @Autowired
@@ -124,10 +123,6 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 
         return projectMemberList;
     }
-
-    @Autowired
-    private IUserAllocationService userAllocationService;
-
     @Override
     public List<Map<String, Object>> getProjectAccountByUserId(String userId, String mediaType) {
         List<Map<String, Object>> result = new ArrayList<>();