Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-15 1a1b692a24b7b70946566ec7f909d049feb538f7

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -274,13 +274,13 @@
        <if test="departmentName != null and departmentName != '' ">,#{departmentName}</if>
        <if test="departmentArea != null and departmentArea != '' ">,#{departmentArea}</if>
        <if test="leisureState != null and leisureState != '' ">,#{leisureState}</if>
        <if test="masterIds != null   ">,#{masterIds}</if>
        <if test="masterNames != null  ' ">,#{masterNames}</if>
        <if test="masterIds != null">,#{masterIds}</if>
        <if test="masterNames != null">,#{masterNames}</if>
        <if test="transactionIds != null and transactionIds != '' ">,#{transactionIds}</if>
        <if test="transactionNames != null and transactionNames != '' ">,#{transactionNames}</if>
        <if test="openid != null and openid != '' ">,#{openid}</if>
        <if test="isDivisionHead != null and isDivisionHead != '' ">,#{isDivisionHead}</if>
        <if test="mattersIds != null  ">,#{mattersIds}</if>
        <if test="mattersIds != null">,#{mattersIds}</if>
        )
    </insert>

@@ -313,13 +313,13 @@
            <if test="departmentName != null and departmentName != '' ">,department_name=#{departmentName}</if>
            <if test="departmentArea != null and departmentArea != '' ">,department_area=#{departmentArea}</if>
            <if test="leisureState != null and leisureState != '' ">,leisure_state=#{leisureState}</if>
            <if test="masterIds != null   ">,master_ids=#{masterIds}</if>
            <if test="masterNames != null   ">,master_names=#{masterNames}</if>
            <if test="masterIds != null">,master_ids=#{masterIds}</if>
            <if test="masterNames != null">,master_names=#{masterNames}</if>
            <if test="transactionIds != null and transactionIds != '' ">,transaction_ids=#{transactionIds}</if>
            <if test="transactionNames != null and transactionNames != '' ">,transaction_names=#{transactionNames}</if>
            <if test="openid != null and openid != '' ">,openid=#{openid}</if>
            <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head=#{isDivisionHead}</if>
            <if test="mattersIds != null   ">,matters_ids=#{mattersIds}</if>
            <if test="mattersIds != null">,matters_ids=#{mattersIds}</if>
            ,update_time=sysdate()
        </set>
        where user_id= #{userId}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java

@@ -580,7 +580,7 @@
    @Override
    public R checkCommit(Long userId) {
        if(userId!=null){
            List<ComActAcidRecord> comActAcidRecords= this.baseMapper.selectList(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIsDel,0).eq(ComActAcidRecord::getUserId,userId).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)).isNull(ComActAcidRecord::getAcidTest));
            List<ComActAcidRecord> comActAcidRecords= this.baseMapper.selectList(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIsDel,0).eq(ComActAcidRecord::getUserId,userId).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)).isNull(ComActAcidRecord::getColorImage));
            return R.ok(comActAcidRecords);
        }
       return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java

@@ -9,13 +9,14 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.common.utlis.RSAUtils;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.service.ComPropertyRepairService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

import static java.util.Objects.nonNull;