Browse Source

缴费项目优化

zouxuan 3 years ago
parent
commit
56db411cd9

+ 3 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrganizationServiceImpl.java

@@ -231,8 +231,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		long insert = organizationDao.insert(organization);
 		long insert = organizationDao.insert(organization);
 		TenantInfo tenantInfo = tenantInfoDao.selectById(organization.getTenantId());
 		TenantInfo tenantInfo = tenantInfoDao.selectById(organization.getTenantId());
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(!sysUser.getId().equals(tenantInfo.getUserId())){
+			updateOrganId(tenantInfo.getUserId(),organization.getId());
+		}
 		updateOrganId(sysUser.getId(),organization.getId());
 		updateOrganId(sysUser.getId(),organization.getId());
-		updateOrganId(tenantInfo.getUserId(),organization.getId());
 		return insert;
 		return insert;
     }
     }
 
 

+ 0 - 5
mec-web/src/main/java/com/ym/mec/web/controller/QuestionnaireUserResultController.java

@@ -11,24 +11,19 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.excel.POIUtil;
 import com.ym.mec.util.excel.POIUtil;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStream;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
-
 import static com.ym.mec.biz.dal.enums.QuestionnaireActiveTypeEnum.CLOUD_TEACHER_FEEDBACK;
 import static com.ym.mec.biz.dal.enums.QuestionnaireActiveTypeEnum.CLOUD_TEACHER_FEEDBACK;
 
 
 @RequestMapping("questionnaireUserResult")
 @RequestMapping("questionnaireUserResult")