Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/constants/Constants.java

@@ -75,4 +75,16 @@ public class Constants
      */
     public static final String DEFAULT_PASSWORD = "12345678";
 
+
+    /**
+     * 是否删除   0-未删除   1-已删除
+     */
+    public static final String NOT_DELETED = "0";
+
+    /**
+     * 是否删除  0-未删除   1-已删除
+     */
+    public static final String DELETE = "1";
+
+
 }

platform/src/main/java/com/jzg/service/impl/QrBarcodeServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.constants.Constants;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.QrBarcodeConfigParam;
 import com.jzg.commons.entity.po.QrBarcodeConfig;
@@ -13,7 +14,6 @@ import com.jzg.mapper.QrBarcodeMapper;
 import com.jzg.service.QrBarcodeService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 
 
 @Service
@@ -24,6 +24,7 @@ public class QrBarcodeServiceImpl extends ServiceImpl<QrBarcodeMapper, QrBarcode
         LambdaQueryWrapper<QrBarcodeConfig> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.isNotEmpty(barcodeConfigParam.getCompanyName()),QrBarcodeConfig::getCompanyName, barcodeConfigParam.getCompanyName());
         queryWrapper.orderByDesc(QrBarcodeConfig::getCreateTime);
+        queryWrapper.eq(QrBarcodeConfig::getIsDelete, Constants.NOT_DELETED);
         Page page = baseMapper.selectPage(barcodeConfigParam.getPage(), queryWrapper);
         page.setRecords(BeanUtil.copyToList(page.getRecords(), QrBarcodeConfigVo.class));
         return HttpResult.ok(page);

tenant/organization/src/main/java/com/jzg/organization/service/impl/PosterServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.constants.Constants;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.PosterParam;
 import com.jzg.commons.entity.po.SysPoster;
@@ -25,7 +26,7 @@ public class PosterServiceImpl extends ServiceImpl<PosterMapper, SysPoster> impl
         QueryWrapper<SysPoster> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotEmpty(posterParam.getTitle()), "p.title", posterParam.getTitle());
         queryWrapper.like(StringUtils.isNotEmpty(posterParam.getOrgName()), "orgName", posterParam.getOrgName());
-        queryWrapper.eq("p.is_delete", 0);
+        queryWrapper.eq("p.is_delete", Constants.NOT_DELETED);
         queryWrapper.orderByDesc("p.create_time");
         Page<SysPosterVo> page = baseMapper.queryPage(posterParam.getPage(), queryWrapper);
         page.getRecords().forEach(sysPosterVo -> {

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationServiceImpl.java

@@ -60,9 +60,7 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
         if (ObjectUtil.isEmpty(sysOrganizationParam)){
             return lambdaQueryWrapper;
         }
-        if (StringUtils.isNotEmpty(sysOrganizationParam.getParam())){
-            lambdaQueryWrapper.like(SysOrganization::getName, sysOrganizationParam.getParam());
-        }
+        lambdaQueryWrapper.like(StringUtils.isNotEmpty(sysOrganizationParam.getParam()),SysOrganization::getName, sysOrganizationParam.getParam());
         lambdaQueryWrapper.orderByDesc(SysOrganization::getCreateTime);
         return lambdaQueryWrapper;
     }
@@ -88,9 +86,7 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
 
     @Override
     public HttpResult addTeamUsers(SysOrganizationUserLinkAdd organizationUserLinkAdd) {
-
-        SysOrganizationUserLink userLink = sysOrganizationUserLinkService.selectByOrgIdAndUserId(organizationUserLinkAdd);
-        if (ObjectUtil.isNotEmpty(userLink)){
+        if (ObjectUtil.isNotEmpty(sysOrganizationUserLinkService.selectByOrgIdAndUserId(organizationUserLinkAdd))){
             return HttpResult.error("该团队、渠道、电销组已关联该用户，请勿重复关联");
         }
         SysOrganizationUserLink organizationUserLink = new SysOrganizationUserLink();
@@ -124,10 +120,10 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
         if (null != idCount && idCount > 0){
             return HttpResult.error("该机构下还有用户，请先删除用户");
         }
-        LambdaUpdateWrapper<SysOrganization> updateWrapper = new LambdaUpdateWrapper<SysOrganization>()
-                .eq(SysOrganization::getId, id)
-                .set(SysOrganization::getIsDelete, 1);
-        return sysOrganizationMapper.update(updateWrapper) > 0 ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
+        return sysOrganizationMapper.update(new LambdaUpdateWrapper<SysOrganization>().
+                eq(SysOrganization::getId, id).
+                set(SysOrganization::getIsDelete, 1)) > 0 ?
+                HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
 
     @Override

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationUserLinkServiceImpl.java

@@ -25,25 +25,21 @@ public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizat
 
     @Override
     public Long selectByOrgIdCount(String id) {
-        LambdaQueryWrapper<SysOrganizationUserLink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SysOrganizationUserLink::getOrganizationId, id);
-        return sysOrganizationUserLinkServiceMapper.selectCount(lambdaQueryWrapper);
+        return sysOrganizationUserLinkServiceMapper.selectCount(new LambdaQueryWrapper<SysOrganizationUserLink>().eq(SysOrganizationUserLink::getOrganizationId, id));
     }
 
     @Override
     public HttpResult deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers) {
-        QueryWrapper<SysOrganizationUserLink> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("organization_id",deleteAssociatedUsers.getId());
-        queryWrapper.in("user_id",deleteAssociatedUsers.getUserIds());
-        return sysOrganizationUserLinkServiceMapper.delete(queryWrapper) > 0 ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
+        return sysOrganizationUserLinkServiceMapper.delete(new LambdaQueryWrapper<SysOrganizationUserLink>().
+                eq(SysOrganizationUserLink::getOrganizationId,deleteAssociatedUsers.getId()).
+                in(SysOrganizationUserLink::getUserId,deleteAssociatedUsers.getUserIds())) > 0 ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
 
     @Override
     public SysOrganizationUserLink selectByOrgIdAndUserId(SysOrganizationUserLinkAdd organizationUserLinkAdd) {
-        LambdaQueryWrapper<SysOrganizationUserLink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SysOrganizationUserLink::getOrganizationId, organizationUserLinkAdd.getOrganizationId())
-                .eq(SysOrganizationUserLink::getUserId, organizationUserLinkAdd.getUserId());
-        return sysOrganizationUserLinkServiceMapper.selectOne(lambdaQueryWrapper);
+        return sysOrganizationUserLinkServiceMapper.selectOne(new LambdaQueryWrapper<SysOrganizationUserLink>().
+                eq(SysOrganizationUserLink::getOrganizationId, organizationUserLinkAdd.getOrganizationId()).
+                eq(SysOrganizationUserLink::getUserId, organizationUserLinkAdd.getUserId()));
     }
 
 

tenant/organization/src/main/resources/mapper/SysOrganizationMapper.xml

@@ -22,14 +22,13 @@
         (SELECT u.username FROM sys_user u WHERE u.id = sys_organization.manager_id) managerName
         from sys_organization
         <where>
-            1=1
-            <if test="params.param != null and params.param != ''">
+            is_delete = 0
+            <if test="params.param != null and params.param.trim() != ''">
                 and sys_organization.name like concat('%',#{params.param},'%')
             </if>
             <if test="params.attribute!= null and params.attribute!= ''">
                 and sys_organization.attribute = #{params.attribute}
             </if>
-        and is_delete = 0
         </where>
     </select>