lihong 11 months ago
parent
commit
2dc5f3f627

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/thmz/FileUploadMapper.java

@@ -35,7 +35,7 @@ public interface FileUploadMapper {
      * @return
      */
     @Insert("INSERT INTO t_file_upload(file_name, file, file_type, mime_type, create_time, create_user,square_file) VALUES " +
-            "(#{fileName,jdbcType=VARCHAR}, #{file,jdbcType=BLOB}, #{fileType,jdbcType=CHAR}, #{mimeType,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},#{createUser,jdbcType=BIGINT}, #{squareFile,jdbcType=BLOB})")
+            "(#{fileName,jdbcType=VARCHAR}, #{file}, #{fileType,jdbcType=VARCHAR}, #{mimeType,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},#{createUser,jdbcType=BIGINT}, #{squareFile}")
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
     int insertFileUpload(FileUpload fileUpload);
 

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/thmz/RoleMapper.java

@@ -16,7 +16,7 @@ public interface RoleMapper {
      *
      * @return
      */
-    @Select("SELECT r.* FROM t_role AS r WHERE r.del_flag=0 ")
+    @Select("SELECT r.* FROM t_role AS r WHERE r.del_flag=0 or del_flag is null  ")
     List<RoleVo> selectAll();
 
     /**

+ 6 - 6
src/main/java/cn/hnthyy/thmz/service/impl/thmz/UserServiceImpl.java

@@ -76,14 +76,14 @@ public class UserServiceImpl implements UserService {
         }
         int num=userMapper.insertUser(user);
         if(StringUtils.isNotBlank(user.getUserName())){
-            byte[] bytes=ImageUtil.generateImg(user.getUserName());
-            FileUpload newFile = new FileUpload(user.getUserName()+".png", bytes, "image/jpeg");
-            newFile.setSquareFile(bytes);
-            newFile.setCreateUser(user.getId());
-            fileUploadMapper.insertFileUpload(newFile);
+            //byte[] bytes=ImageUtil.generateImg(user.getUserName());
+            //FileUpload newFile = new FileUpload(user.getUserName()+".png", bytes, "image/jpeg");
+            //newFile.setSquareFile(bytes);
+            //newFile.setCreateUser(user.getId());
+            //fileUploadMapper.insertFileUpload(newFile);
             User updateUser = new User();
             updateUser.setId(user.getId());
-            updateUser.setProfileImage(newFile.getId());
+            //updateUser.setProfileImage(null);
             updateUser.setUpdateUser(Constants.DEFAULT_USER_ID);
             updateUser.setUpdateTime(user.getCreateTime());
             userMapper.updateUser(updateUser);