update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.service.impl;
 
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
@@ -27,6 +28,8 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
+	private SysUserFeignService sysUserFeignService;
+	@Autowired
 	private SysUserDao sysUserDao;
 
 	@Override
@@ -37,6 +40,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void add(Organization organ) {
+//		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
+//		Organization organization1 = organDao.get(queryUserInfo.getId());
+
 		SysUser sysUser = organ.getSysUser();
 		String tenantId = TenantContextHolder.getTenantId().toString();
 		organ.setTenantId(tenantId);

edu-user/edu-user-server/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -75,10 +75,10 @@
 	<sql id="organQueryPage">
 		<where>
 			del_flag_ = 0 AND tenant_id_ = #{tenantId}
-			<if test="settlementType">
+			<if test="settlementType != null and settlementType != ''">
 				AND settlement_type_ = #{settlementType}
 			</if>
-			<if test="search">
+			<if test="search != null and search != ''">
 				AND (id_ = #{search} OR name_ LIKE CONCAT('%',#{search},'%')
 				OR contact_name_ LIKE CONCAT('%',#{search},'%')
 				OR contact_phone_ LIKE CONCAT('%',#{search},'%'))