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

yanghui

2022-10-14 eddca9819968d95ca160720e778f10e85b921627

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

 flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java

@@ -5,6 +5,7 @@
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IClassifyAdministrationService;
import com.dg.core.service.ITransactionEventService;
@@ -16,6 +17,7 @@
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;


@@ -167,8 +169,22 @@



    /**
     * 树状分类选择列表
     * @return
     */
    @ApiOperation("树状分类选择列表")
    @GetMapping("/getClassifyList")
    public TableDataInfo getClassifyList()
    {
        List<ClassifyAdministration> list=iClassifyAdministrationService.selectConfigList("","1");


        for(ClassifyAdministration entity:list)
        {
            entity.setClassifyAdministrationEntityList(iClassifyAdministrationService.selectParentData(entity.getId()+""));
        }
        return getDataTable(list);
    }




 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -92,16 +92,16 @@
            return error("部门不能为空");
        }

        ResultData data = IUserService.loginByPhonenumber(config.getPhonenumber());
        if (data != null)
        {
            SysUser user= (SysUser) data.getData();
            user.setUserType("2");
            //提示用户名或密码错误
            return toAjax(IUserService.updateConfig(user));
        }
        config.setUserType("2");

        SysUser user=IUserService.selectData(null,config.getPhonenumber());
        if (user != null)
        {
            config.setId(user.getId());
            //提示用户名或密码错误
            return toAjax(IUserService.updateConfig(config));
        }

        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId());

 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

@@ -41,6 +41,10 @@
    IOrganizationChartService iOrganizationChartService;


    @Autowired
    IAreaCodeService iAreaCodeService;


    @ApiOperation("首页统计不同状态工单数")
    @GetMapping("/getWorkOrder")
    public ResultData getWorkOrder()
@@ -317,6 +321,43 @@



    @ApiOperation("导办工单按区域统计")
    @GetMapping("/getRangeStatistics")
    public TableDataInfo getRangeStatistics()
    {
        List<AreaCode2022> code2022s=iAreaCodeService.getListByPCode("510400000000");

        List<RangeStatistics> rangeStatistics=new ArrayList<>();

        for (AreaCode2022 bean:code2022s)
        {
            RangeStatistics range=new RangeStatistics();
            range.setName(bean.getName());

            List<String> ids;

            if(bean.getCode()==510401000000L)
            {
                ids=homeStatisticsService.countId("");
            }
            else
            {
                ids=homeStatisticsService.countId(bean.getCode()+"");
            }
            int num=0;
            if(ids!=null&&ids.size()>0)
            {
                num=iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null);
            }
            range.setNum(num+"");
            rangeStatistics.add(range);
        }


        return getDataTable(rangeStatistics);
    }






 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -6,7 +6,9 @@
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,6 +30,9 @@

    @Autowired(required = true)
    IOrganizationChartService iOrganizationChartService;

    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;

    /**
     * 查询机构列表
@@ -93,6 +98,15 @@
        if(list!=null && list.size()>0)
        {
            return ResultData.error("该机构下存在其他部门！请先删除子部门");
        }

        List<String> ids=new ArrayList<>();
        ids.add(Id);
        List<TransactionEvent> transactionEvents=iTransactionEventService.selectConfigList(null,null,ids);

        if(transactionEvents!=null && transactionEvents.size()>0)
        {
            return ResultData.error("该机构下已绑定办事指南！请解绑办事指南");
        }
        return toAjax(iOrganizationChartService.deleteConfigById(Id));
    }
@@ -162,7 +176,6 @@
        List<OrganizationChartEntity> ids=new ArrayList<>();
        for (OrganizationChartEntity sysStreet:lists)
        {
            ids.add(sysStreet);
            if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
            {
                ids.addAll(disposestreet(sysStreet.getChild()));

 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java

@@ -85,6 +85,20 @@
        {
            return ResultData.error("模板名称不能为空");
        }

        if(StringUtils.isEmpty(sysUser.getDepartmentId()))
        {
            return ResultData.error("部门id不能为空  请分配部门id");
        }

        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        int num=iReplyTemplateService.countNum(entity.getName(),ids);

        if(num>0)
        {
            return ResultData.error("部门里办事名称重复！");
        }

        entity.setId(null);
        entity.setDepartmentId(sysUser.getDepartmentId());
        entity.setCreateUserId(sysUser.getUserId()+"");
@@ -149,6 +163,7 @@
        {
            return ResultData.error("模板不存在！");
        }
        entity.setName(entity.getName()+"(副本)");
        entity.setId(null);
        return toAjax(iReplyTemplateService.insertConfig(entity));
    }

 flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java

New file
@@ -0,0 +1,54 @@
package com.dg.core.controller;

import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.AutomessageSysSettings;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.ISysSettingsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;

@Api(tags = {"系统设置接口"})
@RestController
@RequestMapping("/sysSettings")
public class SysSettingsController {

    @Resource
    private ISysSettingsService sysSettingsService;

    /**
     * 按设置名称查找设置信息
     *
     * @return 参数配置信息
     */
    @ApiOperation(value = "按设置名称查找设置信息",response = AutomessageSysSettings.class)
    @GetMapping("/selectByName")
    @Authorization
    public ResultData selectByName(@RequestParam(value = "settingName",required = false) String settingName){
       if (settingName==null)
           settingName="系统超时基础设置";
       return sysSettingsService.selectByName(settingName);
    }


    /**
     * 修改设置信息
     *
     * @return 参数配置信息
     */
    @ApiOperation(value = "修改设置信息",response = AutomessageSysSettings.class)
    @PostMapping("/update")
    @Authorization
    ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
        automessageSysSettings.setUpdateUserId(sysUser.getUserId().intValue());
        automessageSysSettings.setUpdateTime(LocalDateTime.now());
        return  sysSettingsService.update(automessageSysSettings);
    }


}

 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java

@@ -236,4 +236,5 @@

    }


}

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -62,7 +62,7 @@
            }

            //本地表查询用户
            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
            if (user == null) {
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
@@ -79,7 +79,7 @@
                IUserService.insertConfig(newSysUser);
            }

            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);

            if (user == null) {
                return ResultData.error("用户不存在！请联系管理员");
@@ -280,7 +280,7 @@
            return error("userId不能为空");
        }

        SysUser sysUser=IUserService.selectData(userId);
        SysUser sysUser=IUserService.selectData(userId,null);
        //删除标志（0代表存在 2代表删除）
        sysUser.setDelFlag("2");
        return toAjax(IUserService.updateConfig(sysUser));
@@ -308,7 +308,7 @@
            return error("密码不能为空");
        }

        SysUser sysUser=IUserService.selectData(config.getUserId()+"");
        SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
        if(sysUser==null)
        {
            return error("用户不存在");

 flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java

New file
@@ -0,0 +1,83 @@
package com.dg.core.db.gen.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 系统设置表
 * </p>
 *
 * @author fengjin
 * @since 2022-10-14
 */
@TableName("automessage_sys_settings")
@Data
@ApiModel("系统设置类")
public class AutomessageSysSettings implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 设置名称
     */
    @ApiModelProperty("设置名称")
    private String settingName;

    /**
     * 系统通知时间
     */
    @ApiModelProperty("系统通知时间")
    private Integer timeoutNotificationNum;

    /**
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    private LocalDateTime createTime;

    /**
     * 创建人id
     */
    @ApiModelProperty("创建人id")
    private Integer createUserId;

    /**
     * 更新时间
     */
    @ApiModelProperty("更新时间")
    private LocalDateTime updateTime;

    /**
     * 修改人id
     */
    @ApiModelProperty("修改人id")
    private Integer updateUserId;

    /**
     * 小程序二维码
     */
    @ApiModelProperty("小程序二维码")
    private String appletsUrl;

    /**
     * 官网二维码
     */
    @ApiModelProperty("小程序二维码")
    private String websiteUrl;

}

 flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettingsRecord.java

New file
@@ -0,0 +1,50 @@
package com.dg.core.db.gen.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 系统设置记录表
 * </p>
 *
 * @author fengjin
 * @since 2022-10-14
 */
@TableName("automessage_sys_settings_record")
@Data
@ApiModel("系统设置类")
public class AutomessageSysSettingsRecord implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 设置id
     */
    private Integer settingId;

    /**
     * 创建时间
     */
    private LocalDateTime createTime;

    /**
     * 创建人id（及修改设置的人员）
     */
    private Integer createUserId;



}

 flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java

@@ -74,8 +74,7 @@
    private String parentName;

    @TableField(exist = false)
    @ApiModelProperty(name = "ClassifyAdministrationEntityList", value = "父级分类名字")
    @ApiModelProperty(name = "ClassifyAdministrationEntityList", value = "下级分类")
    private List<ClassifyAdministration> ClassifyAdministrationEntityList;


}

 flower_city/src/main/java/com/dg/core/db/gen/entity/RangeStatistics.java

New file
@@ -0,0 +1,19 @@
package com.dg.core.db.gen.entity;


import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@ApiModel("导办工单根据地区统计")
@Data
public class RangeStatistics implements Serializable
{
    @ApiModelProperty("区域名")
    private String name;

    @ApiModelProperty("数量")
    private String num;
}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsMapper.java

New file
@@ -0,0 +1,16 @@
package com.dg.core.db.gen.mapper;

import com.dg.core.db.gen.entity.AutomessageSysSettings;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 系统设置表 Mapper 接口
 * </p>
 *
 * @author fengjin
 * @since 2022-10-14
 */
public interface AutomessageSysSettingsMapper extends BaseMapper<AutomessageSysSettings> {

}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsRecordMapper.java

New file
@@ -0,0 +1,16 @@
package com.dg.core.db.gen.mapper;

import com.dg.core.db.gen.entity.AutomessageSysSettingsRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author fengjin
 * @since 2022-10-14
 */
public interface AutomessageSysSettingsRecordMapper extends BaseMapper<AutomessageSysSettingsRecord> {

}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/ClassifyAdministrationMapper.java

@@ -77,6 +77,9 @@
    List<String>  selectParent(String parentId);


    List<ClassifyAdministration>  selectParentData(String parentId);




}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java

@@ -86,4 +86,8 @@
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                                    @Param("classifyGrade") String classifyGrade);


    List<String> countId(String district);


}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -29,7 +29,7 @@



    SysUser selectData(String userId);
    SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);


    /**

 flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java

@@ -28,6 +28,17 @@
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);



    /**
     * 导办事物列表 (部分也)
     * @param
     * @return
     */
    public List<TransactionEvent> selectConfigList(@Param("matterAndUser") String matterAndUser,
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);

    /**
     * 新增导办事务
     * @param entity

 flower_city/src/main/java/com/dg/core/db/manual/mapper/util/MapperGenerator.java

@@ -34,7 +34,7 @@
                })
                .strategyConfig(builder -> {
//                    builder.addInclude("");
                    builder.addInclude("automessage_transaction_event_interview") // 设置需要生成的表名
                    builder.addInclude("automessage_sys_settings_record") // 设置需要生成的表名
                            .addTablePrefix("t_", "c_"); // 设置过滤表前缀
                })
                .templateConfig(builder -> {

 flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java

@@ -62,7 +62,7 @@
                //如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
                request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
                System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
                SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"");
                SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"",null);
                if(ss==null && ss.getUserId()<0)
                {
                    HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");

 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java

@@ -39,7 +39,7 @@
        Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
        if (currentUserId != null) {
            //从数据库中查询并返回
            return userService.selectData(currentUserId+"");
            return userService.selectData(currentUserId+"",null);
        }
        return null;
//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);

 flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java

@@ -84,4 +84,7 @@
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                                    @Param("classifyGrade") String classifyGrade);


    List<String> countId(String district);

}

 flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java

@@ -79,5 +79,7 @@
     */
    List<String>  selectParent(String parentId);

    List<ClassifyAdministration>  selectParentData(String parentId);


}

 flower_city/src/main/java/com/dg/core/service/ISysSettingsService.java

New file
@@ -0,0 +1,22 @@
package com.dg.core.service;

import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.AutomessageSysSettings;

public interface ISysSettingsService {


    /**
     * 按设置名称查找设置信息
     *
     * @return 参数配置信息
     */
    ResultData selectByName(String settingName);

    /**
     * 修改设置信息
     *
     * @return 参数配置信息
     */
    ResultData update(AutomessageSysSettings automessageSysSettings);
}

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -17,7 +17,7 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType);


    SysUser selectData(String userId);
    SysUser selectData(String userId,String phonenumber);

    /**
     * 新增聊天记录

 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java

@@ -28,6 +28,13 @@
                                                   List<String> ids);

    /**
     * 导办事物列表
     * @return
     */
    public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade,
                                                   List<String> ids);

    /**
     * 新增导办事务
     * @param entity
     * @return

 flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java

@@ -74,6 +74,11 @@
        return baseMapper.selectParent(parentId);
    }

    @Override
    public List<ClassifyAdministration> selectParentData(String parentId) {
        return baseMapper.selectParentData(parentId);
    }


    @Override
    public int insertConfig(ClassifyAdministration entity) {

 flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java

@@ -75,5 +75,10 @@
        return baseMapper.getClassify(parentId,classifyGrade);
    }

    @Override
    public List<String> countId(String district) {
        return baseMapper.countId(district);
    }


}

 flower_city/src/main/java/com/dg/core/service/impl/SysSettingsServiceImpl.java

New file
@@ -0,0 +1,45 @@
package com.dg.core.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.AutomessageSysSettings;
import com.dg.core.db.gen.entity.AutomessageSysSettingsRecord;
import com.dg.core.db.gen.mapper.AutomessageSysSettingsMapper;
import com.dg.core.db.gen.mapper.AutomessageSysSettingsRecordMapper;
import com.dg.core.service.ISysSettingsService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.LocalDateTime;

@Service
public class SysSettingsServiceImpl extends ServiceImpl<AutomessageSysSettingsMapper, AutomessageSysSettings> implements ISysSettingsService {

    @Resource
    private AutomessageSysSettingsRecordMapper automessageSysSettingsRecordMapper;

    @Override
    public ResultData selectByName(String settingName){
        AutomessageSysSettings automessageSysSettings = baseMapper.selectOne(
                new QueryWrapper<AutomessageSysSettings>().lambda()
                        .eq(AutomessageSysSettings::getSettingName,settingName));
        return ResultData.success(automessageSysSettings);
    }

    @Override
    public ResultData update(AutomessageSysSettings automessageSysSettings){
        AutomessageSysSettingsRecord automessageSysSettingsRecord=new AutomessageSysSettingsRecord();
        automessageSysSettingsRecord.setSettingId(automessageSysSettings.getId());
        automessageSysSettingsRecord.setCreateUserId(automessageSysSettings.getUpdateUserId());
        automessageSysSettingsRecord.setCreateTime(LocalDateTime.now());
        int i = baseMapper.updateById(automessageSysSettings);
        if (i>0){
            return  ResultData.success(automessageSysSettingsRecordMapper.insert(automessageSysSettingsRecord));
        }else {
            return ResultData.error();
        }

    }
}

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -250,8 +250,8 @@
    }

    @Override
    public SysUser selectData(String userId) {
        return baseMapper.selectData(userId);
    public SysUser selectData(String userId,String phonenumber) {
        return baseMapper.selectData(userId,phonenumber);
    }



 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -70,6 +70,11 @@
    }

    @Override
    public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade, List<String> ids) {
        return baseMapper.selectConfigList(matterAndUser,classifyGrade,ids);
    }

    @Override
    public int insertConfig(TransactionEvent entity) {
        return baseMapper.insertConfig(entity);
    }

 flower_city/src/main/java/com/dg/core/util/TestDate.java

@@ -1,6 +1,7 @@
package com.dg.core.util;


import cn.hutool.core.date.DateTime;
import com.alibaba.fastjson.JSONObject;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
@@ -110,4 +111,23 @@
        return dateList;
    }

    /**
     * 判断改日期是否为工作日
     *
     * @param dateTime
     * @return
     */
    public Boolean  isWeekday(DateTime dateTime){
        TestDate td=new TestDate();
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(dateTime);
        Set<String> jjr = td.JJR(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH));
        String strdate = dateTime.toString("yyyy-MM-dd");
        for (String ans: jjr ) {
            if (ans.equals(strdate))
                return  false;
        }
        return  true;
    }

}

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

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSysSettingsMapper">

</mapper>

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

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSysSettingsRecordMapper">

</mapper>

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

@@ -113,6 +113,15 @@
        </where>
    </select>

    <select id="selectParentData" resultType="com.dg.core.db.gen.entity.ClassifyAdministration">
        <include refid="selectClassifyAdministrationEntityVo"/>
        <where>
            <if test="parentId != null and parentId != ''">
                AND parent_id = #{parentId}
            </if>
        </where>
    </select>





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

@@ -126,4 +126,15 @@
    </select>


    <!--  首页统计区域下的部门  -->
    <select id="countId" parameterType="string" resultType="string">
        select id from automessage_organization_chart
        <where>
            <if test="district != null ">
                AND district=#{district}
            </if>
        </where>
    </select>


</mapper>

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

@@ -116,6 +116,11 @@
            <if test="userId!=null and userId!='' ">
                user_id= #{userId}
            </if>

            <if test="phonenumber!=null and phonenumber!='' ">
                phonenumber= #{phonenumber}
            </if>

        </where>
    </select>

@@ -245,7 +250,7 @@
            <if test="openid != null and openid != '' ">,openid=#{openid}</if>
            ,update_time=sysdate()
        </set>
        where user_id= #{userId}
        where id= #{id}
    </update>

    <delete id="deleteConfigById" parameterType="string">