销售代码恢复

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -116,9 +116,9 @@ public class CompanyController extends BaseController
     public R add(@RequestBody Company company)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-//        if(company.getDeptId() != null){//位置迁移到实现类中
-//            company.setDeptId(loginUser.getDeptId());
-//        }
+        if(company.getDeptId() != null){
+            company.setDeptId(loginUser.getDeptId());
+        }
         company.setCreateBy(loginUser.getUsername());
         company.setOldDeptId(loginUser.getDeptId());
         company.setAdmin(loginUser.isAdmin());
@@ -126,7 +126,7 @@ public class CompanyController extends BaseController
         company.setAppId(Md5Utils.hash(company.getUserName()));
         company.setAppKey(Md5Utils.hash(company.getPassword()));
         company.setOmsCode("SF.1");
-        return companyService.insertCompany(company,loginUser.getDeptId());
+        return companyService.insertCompany(company);
     }
 
     /**

fs-admin/src/main/java/com/fs/his/controller/FsCompanyController.java

@@ -152,13 +152,13 @@ public class FsCompanyController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-//        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
-//            company.setDeptId(loginUser.getDeptId());
-//        }
+        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+            company.setDeptId(loginUser.getDeptId());
+        }
         company.setAdmin(loginUser.isAdmin());
         company.setOldDeptId(loginUser.getDeptId());
         company.setCreateBy(loginUser.getUsername());
-        return companyService.insertCompany(company,loginUser.getDeptId());
+        return companyService.insertCompany(company);
     }
 
     /**

fs-service/src/main/java/com/fs/company/service/ICompanyService.java

@@ -53,7 +53,7 @@ public interface ICompanyService
      * @param company 企业
      * @return 结果
      */
-    public R insertCompany(Company company,Long userDeptId);
+    public R insertCompany(Company company);
 
     /**
      * 修改企业

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -159,7 +159,7 @@ public class CompanyServiceImpl implements ICompanyService
      */
     @Override
     @Transactional
-    public R insertCompany(Company company,Long userDeptId)
+    public R insertCompany(Company company)
     {
         //帐号是否存在
         if(userMapper.checkUserName(company.getUserName())>0){
@@ -183,10 +183,6 @@ public class CompanyServiceImpl implements ICompanyService
             sysDeptConfigService.updateById(deptConfig);
         }
 
-        if(company.getDeptId() != null){
-            company.setDeptId(userDeptId);
-        }
-
         if(companyMapper.insertCompany(company)>0){
             //写入帐号信息
             //创建部门