reajustement workflow

src/main/java/io/gmss/fiscad/entities/rfu/metier/ImpositionsTfu.java

@@ -51,6 +51,7 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
     private String datePieceAdmin;
 
     @Enumerated(EnumType.STRING)
+
     private StatusAvis statusAvis;
     @Formula("""
         (
@@ -59,6 +60,7 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
             WHERE d.impositions_tfu_id = id
         )
     """)
+    @Transient
     private Integer nombreAvis;
     @Formula("""
         (
@@ -68,6 +70,7 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
             and (d.nature_impot='FNB' or d.nature_impot='FB')
         )
     """)
+    @Transient
     private Integer nombreAvisFnb;
     @Formula("""
         (
@@ -78,7 +81,9 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
             and d.batiment_id is not null
         )
     """)
+    @Transient
     private Integer nombreAvisBatiment;
+
     @Formula("""
         (
             SELECT COUNT(DISTINCT (d.annee, d.code_commune, d.personne_id))
@@ -88,6 +93,7 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
             and d.unite_logement_id is not null
         )
     """)
+    @Transient
     private Integer nombreAvisUniteLog;
 
     @Column(columnDefinition = "TEXT")

src/main/java/io/gmss/fiscad/implementations/user/UserServiceImpl.java

@@ -137,9 +137,10 @@ public class UserServiceImpl implements UserService {
     public UserPaylaodWeb updateUser(Long id, UserPaylaodWeb userPaylaodWeb) {
 
         if ((userRepository.findByUsername(userPaylaodWeb.getLogin()).isEmpty())
-                || (userRepository.findByEmail(userPaylaodWeb.getEmail()).isEmpty())) {
+                && (userRepository.findByEmail(userPaylaodWeb.getEmail()).isEmpty())) {
             throw new BadRequestException("Cet utilisateur n'existe pas.");
         }
+
         if (userPaylaodWeb.getId() == null) {
             throw new BadRequestException("Cet utilisateur n'existe déjà.");
         }