代码格式化

src/main/java/cn/ezhizao/project/monitor/service/ISysOperLogService.java

@@ -9,8 +9,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-public interface ISysOperLogService
-{
+public interface ISysOperLogService {
     /**
      * 新增操作日志
      *
@@ -28,6 +27,7 @@ public interface ISysOperLogService
 
     /**
      * 根据ids查询系统操作日志集合
+     *
      * @param ids
      * @return
      */

src/main/java/cn/ezhizao/project/monitor/service/impl/SysOperLogServiceImpl.java

@@ -47,6 +47,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService
      * @param ids
      * @return
      */
+    @Override
     public List<SysOperLog> selectOperLogListByIds(List<Long> ids)
     {
         return operLogMapper.selectOperLogListByIds(ids);

src/main/java/cn/ezhizao/project/system/controller/SysDictDataController.java

@@ -120,8 +120,8 @@ public class SysDictDataController extends BaseController
     public SysDictData getDictData(String type, String value)
     {
         SysDictData sysDictData = new SysDictData();
-        sysDictData.setDictType(type);
-        sysDictData.setDictValue(value);
+        sysDictData.setDictType(type.trim());
+        sysDictData.setDictValue(value.trim());
 
         return dictDataService.getDictData(sysDictData);
     }

src/main/java/cn/ezhizao/project/system/domain/SysUser.java

@@ -31,7 +31,6 @@ public class SysUser extends BaseEntity {
     @TableId
     private Long userId;
 
-    private Long tenantId;
     private String orgName;
 
     /**
@@ -135,16 +134,6 @@ public class SysUser extends BaseEntity {
     private Integer isYardman;
     private Integer isEdit;
 
-    @Override
-    public Long getTenantId() {
-        return tenantId;
-    }
-
-    @Override
-    public void setTenantId(Long tenantId) {
-        this.tenantId = tenantId;
-    }
-
     public Integer getIsLeader() {
         return isLeader;
     }
@@ -370,7 +359,6 @@ public class SysUser extends BaseEntity {
                        .append("tenantId", getTenantId())
                        .append("userName", getUserName())
                        .append("nickName", getNickName())
-                        .append("tenantId", getTenantId())
                        .append("email", getEmail())
                        .append("phoneNumber", getPhoneNumber())
                        .append("sex", getSex())

src/main/resources/mybatis/system/SysDictDataMapper.xml

@@ -72,9 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	</delete>
 	<select id="getDictData" parameterType="SysDictData" resultMap="SysDictDataResult">
 		select * from sys_dict_data where status = 0
-			<if test="dictType !='' and dictType != null"> and dict_type=#{dictType}</if>
+		<if test="dictType !='' and dictType != null"> and dict_type=#{dictType}</if>
 		<if test="dictLabel !='' and dictLabel != null"> and dict_label=#{dictLabel}</if>
 	</select>
+
 	<update id="updateDictData" parameterType="SysDictData">
  		update sys_dict_data
  		<set>